[scripts] shellcheck fixes

Author: ar2rsawseen

.travis.yml

@@ -20,7 +20,9 @@ before_script:
 - nodejs --version
 - ${PWD}/mongodb-linux-x86_64-${MONGODB}/bin/mongod --version
 - cat ${PWD}/mongod.log
-script: sudo npm test
+script:
+- countly shellcheck
+- sudo npm test
 after_script:
 - cat log/countly-api.log
 - cat log/countly-dashboard.log

bin/backup/run.sh

@@ -17,7 +17,8 @@
 cd "$(dirname "$0")"
 
 function check_connectivity_mongo() {
-	local MONGO_OK=$(mongo \
+    local MONGO_OK;
+	MONGO_OK=$(mongo \
 		--quiet \
 		--eval "db.serverStatus().ok == true")
 
@@ -32,16 +33,16 @@ function check_connectivity_mongo() {
 # generic check connectivity function
 function check_connectivity() {
 	retries=600
-	until eval "check_connectivity_$@"; do
+	until eval "check_connectivity_$*"; do
 		sleep 1
 		let retries--
 		if [ $retries == 0 ]; then
-			echo "time out while waiting for $@ is ready"
+			echo "time out while waiting for $* is ready"
 			exit 1
 		fi
-		echo "$@ is not reachable yet, trying again..."
+		echo "$* is not reachable yet, trying again..."
 	done
-	echo "$@ is up and running..."
+	echo "$* is up and running..."
 }
 
 # wait till mongo becomes online.

bin/commands/countly.sh

@@ -50,7 +50,7 @@ run_upgrade (){
     else
         echo "Upgrading versions: $1";
     fi
-    arr=$@;
+    arr=("$@");
     for i in ${1//;/ }
     do
         if [[ $2 == "fs" ]]
@@ -63,7 +63,7 @@ run_upgrade (){
                         continue
                     fi
                 fi
-                bash "$DIR/../upgrade/$i/upgrade_fs.sh";
+                #bash "$DIR/../upgrade/$i/upgrade_fs.sh";
             else
                 echo "No filesystem upgrade script provided for $i";
             fi
@@ -101,6 +101,11 @@ countly_upgrade (){
     arr=("$@");
     if [[ " ${arr[*]} " == *" -y "* ]]; then
         y="-y";
+        for arg do
+            shift
+            [ "$arg" = "-y" ] && continue
+            set -- "$@" "$arg"
+        done
     fi
     countly_root ;
     if [ $# -eq 0 ]
@@ -183,8 +188,8 @@ countly_upgrade (){
             (cd "$DIR/../..";
             tar xaf countly-enterprise-edition*.tar.gz --strip=1 countly;)
 
-            EE_PLUGINS=$(cat "$DIR/../../plugins/plugins.ee.json" | sed 's/\"//g' | sed 's/\[//g' | sed 's/\]//g')
-            CE_PLUGINS=$(cat "$DIR/../../plugins/plugins.ce.json" | sed 's/\"//g' | sed 's/\[//g' | sed 's/\]//g')
+            EE_PLUGINS=$(sed 's/\"//g' "$DIR/../../plugins/plugins.ee.json" | sed 's/\[//g' | sed 's/\]//g')
+            CE_PLUGINS=$(sed 's/\"//g' "$DIR/../../plugins/plugins.ce.json" | sed 's/\[//g' | sed 's/\]//g')
             PLUGINS_DIFF=$(echo " ${EE_PLUGINS}, ${CE_PLUGINS}" | tr ',' '\n' | sort | uniq -u)
             echo "Enabling plugins..."
             for plugin in $PLUGINS_DIFF; do
@@ -297,8 +302,13 @@ countly_backupdb (){
     (mkdir -p "$1" ;
     cd "$1" ;
     echo "Backing up mongodb...";
-    mongodump $(node $DIR/scripts/db.conf.js countly) > /dev/null;
-    mongodump $(node $DIR/scripts/db.conf.js countly_drill) > /dev/null;
+    shift
+    #allow passing custom flags
+    connection=( $(node "$DIR/scripts/db.conf.js")  "${@}" );
+    mongodump "${connection[@]}" --db countly > /dev/null;
+    mongodump "${connection[@]}" --db countly_drill > /dev/null;
+    mongodump "${connection[@]}" --db countly_fs > /dev/null;
+    mongodump "${connection[@]}" --db countly_out > /dev/null;
     )
 }
 
@@ -333,13 +343,13 @@ countly_save (){
     if [ -f "$1" ]
     then
         match=false
-        files=$(ls "$2" | wc -l)
+        files=$(find "$2" -maxdepth 1 -type f -printf x | wc -c)
 
-        if [ $files -gt 0 ]
+        if [ "$files" -gt 0 ]
         then
             for d in $2/*; do
-                diff=$(diff $1 $d | wc -l)
-                if [ $diff == 0 ]
+                diff=$(diff "$1" "$d" | wc -l)
+                if [ "$diff" == 0 ]
                 then
                     match=true
                     break
@@ -348,7 +358,7 @@ countly_save (){
         fi
 
         files=$((files+1))
-        filebasename=$(basename $1)
+        filebasename=$(basename "$1")
         if [ "$match" == false ]
         then
             cp -a "$1" "$2/${filebasename}.backup.${files}"
@@ -401,7 +411,7 @@ countly_restorefiles (){
         fi
 
         for d in files/plugins/*; do
-            PLUGIN=$(basename $d);
+            PLUGIN=$(basename "$d");
             if [ -f "$d/config.js" ]; then
                 mkdir -p "$DIR/../../plugins/$PLUGIN" ;
                 cp "$d/config.js" "$DIR/../../plugins/$PLUGIN/config.js" ;
@@ -429,18 +439,35 @@ countly_restoredb (){
         echo "Please provide path" ;
         return 0;
     fi
+    shift
+    #allow passing custom flags
+    connection=( $(node "$DIR/scripts/db.conf.js")  "${@}" );
     if [ -d "$1/dump/countly" ]; then
         echo "Restoring countly database...";
-        mongorestore $(node $DIR/scripts/db.conf.js countly) --batchSize=10 "$1/dump/countly" > /dev/null;
+        mongorestore "${connection[@]}" --db countly --batchSize=10 "$1/dump/countly" > /dev/null;
     else
         echo "No countly database dump to restore from";
     fi
     if [ -d "$1/dump/countly_drill" ]; then
         echo "Restoring countly_drill database...";
-        mongorestore $(node $DIR/scripts/db.conf.js countly_drill) --batchSize=10 "$1/dump/countly_drill" > /dev/null;
+        mongorestore "${connection[@]}" --db countly_drill --batchSize=10 "$1/dump/countly_drill" > /dev/null;
     else
         echo "No countly_drill database dump to restore from";
     fi
+    
+    if [ -d "$1/dump/countly_fs" ]; then
+        echo "Restoring countly_fs database...";
+        mongorestore "${connection[@]}" --db countly_fs --batchSize=10 "$1/dump/countly_fs" > /dev/null;
+    else
+        echo "No countly_fs database dump to restore from";
+    fi
+    
+    if [ -d "$1/dump/countly_out" ]; then
+        echo "Restoring countly_out database...";
+        mongorestore "${connection[@]}" --db countly_out --batchSize=10 "$1/dump/countly_out" > /dev/null;
+    else
+        echo "No countly_out database dump to restore from";
+    fi
 }
 
 countly_restore (){
@@ -465,9 +492,9 @@ source "$DIR/enabled/countly.sh"
 #process command
 NAME="$1";
 SCRIPT="$2";
-if [ -n "$(type -t countly_$1)" ] && [ "$(type -t countly_$1)" = function ]; then
+if [ -n "$(type -t "countly_$1")" ] && [ "$(type -t "countly_$1")" = function ]; then
     shift;
-    countly_${NAME} "$@";
+    "countly_${NAME}" "$@";
 elif [ -f "$DIR/scripts/$NAME.sh" ]; then
     shift;
     bash "$DIR/scripts/$NAME.sh" "$@";

bin/commands/launchd/install.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
-
 sudo cp /usr/local/Cellar/mongodb/2.2.0-x86_64/homebrew.mxcl.mongodb.plist /Library/LaunchDaemons/
 sudo cp com.countly.dashboard.plist /Library/LaunchDaemons/
 sudo cp com.countly.api.plist /Library/LaunchDaemons/

bin/commands/scripts/healthcheck/nginx.sh

@@ -2,7 +2,7 @@
 
 nginxpath="/var/log/nginx/error.log"
 curdate=$(date "+%Y/%m/%d %H")
-errors=$(cat ${nginxpath} | grep "${curdate}" | wc -l);
+errors=$(grep "${curdate}" ${nginxpath} -c);
 
 if [ "${errors}" -gt 0 ]; then
     echo -e "You have $errors error(s) in the last hour in your nginx error.log";

bin/commands/scripts/healthcheck/permissions.sh

@@ -2,6 +2,7 @@
 
 procowner="0"
 fileowner=$(stat -c '%U' "$(countly dir)")
+# shellcheck disable=SC2009
 paths=$(ps -ux | grep countly)
 while read line; do
     if [[ "$line" = *"dashboard node"* ]]; then

bin/commands/scripts/healthcheck/process.sh

@@ -32,6 +32,7 @@ workersthreshold=$(nproc)
 appproc=0
 apiproc=0
 workers=0
+# shellcheck disable=SC2009
 paths=$(ps -ax | grep countly)
 while read line; do
     if [[ "$line" = *"dashboard node"* ]]; then

bin/commands/scripts/shellcheck.sh

@@ -1,8 +1,10 @@
 #!/bin/bash
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-find $DIR/../../../ -type f  -name "*.sh" -print |
+find "$DIR/../../../" -type f  -name "*.sh" -print |
   while IFS="" read -r file
   do
-    shellcheck "$file"
+    if [[ $file != *"/node_modules/"* ]] && [[ $file != *"/core/"* ]] && [[ $file != *"/bin/scripts/nghttp2/"* ]]; then
+        shellcheck "$file"
+    fi
   done

bin/config/countly_user.sh

@@ -18,7 +18,7 @@ fi
 yes | cp -rf "$DIR/supervisort.wuser.conf" "$COUNTLY_DIR/bin/config/supervisord.conf"
 
 #check if user not created yet
-if [ $(getent passwd countly)x == 'x' ]; then
+if [ "$(getent passwd countly)x" == 'x' ]; then
 
     #create countly user
     useradd -r -M -U -d "$COUNTLY_DIR" -s /bin/false countly

bin/countly.install_rhel.sh

@@ -40,7 +40,7 @@ set +e
 NODE_JS_CMD=$(which nodejs)
 set -e
 if [[ -z "$NODE_JS_CMD" ]]; then
-	ln -s $(which node) /usr/bin/nodejs
+	ln -s "$(which node)" /usr/bin/nodejs
 fi
 
 #install nginx
@@ -77,7 +77,10 @@ if grep -q -i "release 6" /etc/redhat-release ; then
     wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
     yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
     source /opt/rh/devtoolset-2/enable
-    export CC=$(which gcc) CXX=$(which g++)
+    CC="$(which gcc)"
+    CXX="$(which g++)"
+    export $CC 
+    export $CXX
 fi
 
 #install grunt & npm modules
@@ -146,7 +149,7 @@ cd "$DIR/.." && grunt dist-all
 #finally start countly api and dashboard
 countly start
 
-ENABLED=`getenforce`
+ENABLED=$(getenforce)
 if [ "$ENABLED" == "Enforcing" ]; then
   echo -e "\e[31mSELinux is enabled, please disable it or add nginx to exception for Countly to work properly\e[0m"
 fi

bin/docker/cmd.sh

@@ -14,6 +14,6 @@ case "$COUNTLY_CONTAINER" in
    * )
     # Run custom command. Thanks to this line we can still use 
     # "docker run our_image /bin/bash" and it will work
-    exec $CMD ${@:2}
+    exec "$CMD" "${@:2}"
     ;;
 esac

bin/docker/preinstall.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-for plugin in `find /opt/countly/plugins -type d -mindepth 1 -maxdepth 1`
+while IFS= read -r -d '' plugin
 do
-	echo "Installing $plugin..."
+    echo "Installing $plugin..."
 	(cd "$plugin" && HOME=/tmp npm install)
 	echo "done"
-done
+done <   <(find /opt/countly/plugins -type d -mindepth 1 -maxdepth 1)

bin/scripts/deploy.sh

@@ -2,9 +2,9 @@
 
 if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "Countly/countly-server" ]; then
     if [ "$TRAVIS_BRANCH" == "master" ] || [ "$TRAVIS_BRANCH" == "next" ]; then
-        openssl aes-256-cbc -K "$encrypted_2b5a1ad4da99_key" -iv "$encrypted_2b5a1ad4da99_iv" -in deploy-key.enc -out deploy-key -d;
+        openssl aes-256-cbc -K "${encrypted_2b5a1ad4da99_key:?}" -iv "${encrypted_2b5a1ad4da99_iv:?}" -in deploy-key.enc -out deploy-key -d;
         chmod 600 deploy-key;
         mv deploy-key ~/.ssh/id_rsa;
-        ssh -oStrictHostKeyChecking=no "countly@$TRAVIS_BRANCH.count.ly" "bash /home/countly/deploy.sh > /home/countly/logs/countly-deploy-$TRAVIS_BUILD_NUMBER-$TRAVIS_COMMIT.log 2>&1 &"
+        ssh -oStrictHostKeyChecking=no "countly@$TRAVIS_BRANCH.count.ly" "bash /home/countly/deploy.sh > /home/countly/logs/countly-deploy-\$TRAVIS_BUILD_NUMBER-\$TRAVIS_COMMIT.log 2>&1 &"
     fi
 fi

bin/scripts/detect.init.sh

@@ -7,7 +7,7 @@ INITSYS="systemd"
 
 if [ -z "$COUNTLY_CONTAINER" ]
 then
-	if [[ `/sbin/init --version` =~ upstart ]];
+	if [[ $(/sbin/init --version) =~ upstart ]];
 	then
 	    INITSYS="upstart"
 	fi 2> /dev/null

bin/scripts/generateDocs.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #Original source https://gist.github.com/vidavidorra/548ffbcdae99d752da02
 
@@ -30,7 +30,7 @@ git config user.email "[email protected]"
 # stayed the same and will only update the changed files. So the gh-pages branch
 # can be safely cleaned, and it is sure that everything pushed later is the new
 # documentation.
-rm -rf *
+rm -rf ./*
 
 # Need to create a .nojekyll file to allow filenames starting with an underscore
 # to be seen on the gh-pages site. Therefore creating an empty .nojekyll file.