rootfs: use dot instead of source in scripts

Source using ". file" instead of "source file". The second form is a bashism. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: use dot instead of source in scripts
Source using ". file" instead of "source file". The second form is a bashism. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
fc398e6c · Adam Wujek · 7a197e97 · fc398e6c · fc398e6c · fc398e6c
Commit fc398e6c authored Aug 09, 2016 by Adam Wujek 💬
Showing with 8 additions and 6 deletions

dot-config userspace/rootfs_override/etc/init.d/dot-config +3 -2

apply_dot-config userspace/rootfs_override/wr/bin/apply_dot-config +3 -2

dhcp_extra_opt.sh userspace/rootfs_override/wr/bin/dhcp_extra_opt.sh +2 -2

No files found.
--- a/userspace/rootfs_override/etc/init.d/dot-config
+++ b/userspace/rootfs_override/etc/init.d/dot-config
@@ -13,7 +13,8 @@ tmpdir=/tmp
 rm -f "$tmpdir"/dot-config_source

 if [ -f $dotconfig ]; then
-    source $dotconfig
+    # source dot-config
+    . $dotconfig
    ret_source=$?
    /wr/bin/wrs_checkcfg $dotconfig /wr/etc/Kconfig
    ret_check=$?
@@ -111,7 +112,7 @@ if [ "$CONFIG_DOTCONF_SOURCE_REMOTE" = "y" ] || [ "$CONFIG_DOTCONF_SOURCE_TRY_DH
 	# then try to source it in another shell to verify syntax
 	if [ $(cat $tmpconfig | wc -c) -gt 200 ] &&
 	    /wr/bin/wrs_checkcfg $tmpconfig /wr/etc/Kconfig &&
-	    /bin/sh -c "source $tmpconfig"; then
+	    /bin/sh -c ". $tmpconfig"; then
 	    echo "Using newly-downloaded dot-config from $URL" >& 2
 	    # copy it in place to use the new file (unless it is identical)
 	    cmp -s $tmpconfig $dotconfig || cp $tmpconfig $dotconfig

--- a/userspace/rootfs_override/wr/bin/apply_dot-config
+++ b/userspace/rootfs_override/wr/bin/apply_dot-config
@@ -31,7 +31,8 @@ if [ "$1" == "local_config" ]; then

    # Check and complain
    if [ -f /wr/etc/dot-config ]; then
-	source /wr/etc/dot-config
+	# source dot-config
+	. /wr/etc/dot-config
 	ret_source=$?
 	/wr/bin/wrs_checkcfg /wr/etc/dot-config /wr/etc/Kconfig
 	ret_check=$?
@@ -52,7 +53,7 @@ if [ "$1" == "local_config" ]; then
 elif [ -f /wr/etc/dot-config ]; then
    # if config was not touched by webinterface simply source it, the check was
    # done by /etc/init.d/dot-config
-    source /wr/etc/dot-config
+    . /wr/etc/dot-config
 fi

 ##### Actual configuration actions start here.

--- a/userspace/rootfs_override/wr/bin/dhcp_extra_opt.sh
+++ b/userspace/rootfs_override/wr/bin/dhcp_extra_opt.sh
@@ -12,5 +12,5 @@ if [ -n "$hostname" ]; then
    echo "$hostname" > /etc/hostname
 fi

-# call default script
-source /usr/share/udhcpc/default.script
+# source default script
+. /usr/share/udhcpc/default.script