Merge bd2c5eeec1 into 483f7fd7f3

tools/common.sh

@@ -190,7 +190,7 @@ apost_beacon()
 
 get_os_type()
 {
-    test -z "$DFS_OS_TYPE" || { echo "$DFS_OS_TYPE"; return; }
+    test -z "$DFS_OS_TYPE" || ( echo "$DFS_OS_TYPE"; return )
     local ans="unknown"
     case "$(uname -s)" in
         Darwin*)    ans="MacOS";;
@@ -205,7 +205,7 @@ get_os_type()
 
 get_linux_dist()
 {
-    test -z "$DFS_LINUX_DIST" || { echo "$DFS_LINUX_DIST"; return; }
+    test -z "$DFS_LINUX_DIST" || ( echo "$DFS_LINUX_DIST"; return )
     local ans="unknown"
     if [ -f /etc/os-release ]; then
         . /etc/os-release