diff --git a/apps/bash_shared/defines.sh b/apps/bash_shared/defines.sh index 8a3eb6e18..605d3c30f 100644 --- a/apps/bash_shared/defines.sh +++ b/apps/bash_shared/defines.sh @@ -1,4 +1,4 @@ -unamestr=`uname` +unamestr=$(uname) if [[ "$unamestr" == 'Darwin' ]]; then AC_PATH_ROOT=$(greadlink -f "$AC_PATH_APPS/../") else diff --git a/apps/compiler/includes/functions.sh b/apps/compiler/includes/functions.sh index f9ac5ce08..ff2537535 100644 --- a/apps/compiler/includes/functions.sh +++ b/apps/compiler/includes/functions.sh @@ -46,7 +46,7 @@ function comp_configure() { function comp_compile() { - [ $MTHREADS == 0 ] && MTHREADS=`grep -c ^processor /proc/cpuinfo` && MTHREADS=$(($MTHREADS + 2)) + [ $MTHREADS == 0 ] && MTHREADS=$(grep -c ^processor /proc/cpuinfo) && MTHREADS=$(($MTHREADS + 2)) echo "Using $MTHREADS threads" diff --git a/apps/installer/includes/includes.sh b/apps/installer/includes/includes.sh index 9c874beef..5afd4a159 100644 --- a/apps/installer/includes/includes.sh +++ b/apps/installer/includes/includes.sh @@ -17,8 +17,8 @@ if [ ! -d "$J_PATH/.git" ]; then git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" reset --hard "$J_VER_REQ" else # legacy code, with new rev of joiner the update process is internally handled - _cur_branch=`git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" rev-parse --abbrev-ref HEAD` - _cur_ver=`git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" name-rev --tags --name-only $_cur_branch` + _cur_branch=$(git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" rev-parse --abbrev-ref HEAD) + _cur_ver=$(git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" name-rev --tags --name-only $_cur_branch) if [ "$_cur_ver" != "$J_VER_REQ" ]; then git --git-dir="$J_PATH/.git" --work-tree="$J_PATH/" rev-parse && git --git-dir="$J_PATH/.git" --work-tree="$J_PATH/" fetch --tags origin master --quiet git --git-dir="$J_PATH/.git/" --work-tree="$J_PATH/" reset --hard "$J_VER_REQ"