shell script linting

4 files changed, 22 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc2a82bb1f52..e25987f36a7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,8 +34,8 @@ pkgbase = i2p-dev
 	sha256sums = 5c57456bf3f364175d036dfc6c6ceea5e57cdda970407829c04d09a4c821a9c0
 	sha256sums = 4ee28e022dccaf99043aa2735f05b7270b8eccf040c67f7ef48e114b5ca6e971
 	sha256sums = 7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a
-	sha256sums = b5f1a5bb354552acebe2857b9579410f7fd589f2f7d6b12fbbfe4127a2d33fd8
-	sha256sums = 2d5ae5f5379e6ea095bb30c374b493b1fdd47b06aa536760c6c73bb062eb6eef
+	sha256sums = 7e94bcd530161251f99cdc033fbbaad0a07f3dac02ebd318edb08580ea500160
+	sha256sums = 77e359cf880ccc09f504372ef85c8ad3ab7d1186106a4ae92c4ff4f37ae650e0
 
 pkgname = i2p-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index 99ae6b2182c4..0c6d4e91f52d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,8 +34,8 @@ sha256sums=('SKIP'
             '5c57456bf3f364175d036dfc6c6ceea5e57cdda970407829c04d09a4c821a9c0'
             '4ee28e022dccaf99043aa2735f05b7270b8eccf040c67f7ef48e114b5ca6e971'
             '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a'
-            'b5f1a5bb354552acebe2857b9579410f7fd589f2f7d6b12fbbfe4127a2d33fd8'
-            '2d5ae5f5379e6ea095bb30c374b493b1fdd47b06aa536760c6c73bb062eb6eef')
+            '7e94bcd530161251f99cdc033fbbaad0a07f3dac02ebd318edb08580ea500160'
+            '77e359cf880ccc09f504372ef85c8ad3ab7d1186106a4ae92c4ff4f37ae650e0')
 
 pkgver() {
     cd "$_gitname"
@@ -74,7 +74,7 @@ build() {
 
     cd "$srcdir/$_gitname"
 
-    ant -Dworkspace.version=$(git rev-parse --short $_commit) \
+    ant -Dworkspace.version="$(git rev-parse --short $_commit)" \
         -Dfile.encoding=UTF-8 \
         -Djavac.compilerargs=-Xlint:-options \
         -Dbuild.reproducible=true \
@@ -97,7 +97,7 @@ package() {
 
     install -Dm644 "$srcdir/router.config"     "opt/i2p/router.config"
     install -Dm644 "$srcdir/wrapper.config"    "opt/i2p/wrapper.config"
-    install -Dm755 "$srcdir/i2prouter.sh"      "opt/i2p/i2prouter"
+    install -Dm754 "$srcdir/i2prouter.sh"      "opt/i2p/i2prouter"
     install -Dm755 "$srcdir/chromium-i2p.sh"   "opt/i2p/scripts/chromium-i2p"
 
     install -Dm644 "$srcdir/i2prouter.bash"    "usr/share/bash-completion/completions/i2prouter"
diff --git a/chromium-i2p.sh b/chromium-i2p.sh
index e9a9181fcccd..35c9b226c5a3 100644
--- a/chromium-i2p.sh
+++ b/chromium-i2p.sh
@@ -1,11 +1,11 @@
- #!/usr/bin/env bash
+#!/usr/bin/env bash
 set -e
 
 DATADIR=${XDG_CONFIG_HOME:-$HOME/.config}/chromium-i2p
 
 [[ ! -f $DATADIR/.config ]] && {
     echo "creating config..."
-    install -dm700 $DATADIR
+    install -dm700 "$DATADIR"
     cat <<< '
 CACHEDIR=/dev/shm/chromium-i2p # store in ram, or
 #CACHEDIR=$DATADIR/.tmp        # keep on disk
@@ -15,11 +15,11 @@ INCOGNITO=--incognito          # comment out if you wish to have
                                # urlhistory, passwords, etc. saved
 PROXY=127.0.0.1:4444
 CONSOLE=127.0.0.1:7657
-' >$DATADIR/.config
+' >"$DATADIR/.config"
     echo "$DATADIR/.config"
 }
 
-source $DATADIR/.config
+source "$DATADIR/.config"
 
 /usr/bin/chromium "$INCOGNITO" \
     --user-data-dir="$DATADIR" \
@@ -55,4 +55,4 @@ source $DATADIR/.config
     --no-report-upload \
     --site-per-process \
     --use-fake-device-for-media-stream \
-    ${@:-$CONSOLE}
+   "${@:-$CONSOLE}"
diff --git a/i2prouter.sh b/i2prouter.sh
index f4e7ac9a411d..e57d880d71b0 100644
--- a/i2prouter.sh
+++ b/i2prouter.sh
@@ -20,8 +20,8 @@ check_user() {
     if [[ "$(id -un)" != "$I2P_USER" ]]; then
         #debug "current user: $(id -un)  dropping to user: $I2P_USER"
         #chmod 700 /opt/i2p/.{i2p,tmp}
-        SCRIPT_PATH="$(cd $(dirname $0) && pwd)/$(basename $0)"
-        su - "$I2P_USER" -c "${SCRIPT_PATH} $@"
+        SCRIPT_PATH="$(cd "$(dirname $0)" && pwd)/$(basename $0)"
+        su - "$I2P_USER" -c "${SCRIPT_PATH}" "$@"
         exit $?
     fi
 }
@@ -70,8 +70,7 @@ check_if_running() {
 _console() {
     if [[ ! "$pid" ]]; then
         trap '' INT QUIT
-        eval $COMMAND_LINE
-        [[ $? != 0 ]] && fail "Failed to launch the wrapper!"
+        eval "$COMMAND_LINE" || fail "Failed to launch the wrapper!"
     else
         echo "I2P Router is already running! (pid: $pid)"
     fi
@@ -81,8 +80,7 @@ _start() {
     if [[ ! "$pid" ]]; then
         echo -n "Starting I2P Router"
         COMMAND_LINE+=" wrapper.daemonize=TRUE"
-        eval $COMMAND_LINE
-        [[ $? != 0 ]] && fail "Failed to launch the wrapper!"
+        eval "$COMMAND_LINE" || fail "Failed to launch the wrapper!"
         i=0
         while [[ ! "$pid" || $i < $TIMEOUT ]]; do
             echo -n "."
@@ -99,14 +97,13 @@ _start() {
 
 _restart() {
     [[ "$pid" ]] &&
-        kill -USR1 $(get_wrapper_pid) || echo "I2P Router is not running"
+        kill -USR1 "$(get_wrapper_pid)" || echo "I2P Router is not running"
 }
 
 _stop() {
     if [[ "$pid" ]]; then
         echo -n "Hard shutdown initiated"
-        kill -TERM "$pid"
-        [[ $? != 0 ]] && fail "Unable to stop I2P Router: kill -TERM $pid"
+        kill -TERM "$pid" || fail "Unable to stop I2P Router: kill -TERM $pid"
         i=0
         while [[ "$pid" || $i > $TIMEOUT ]]; do
             echo -n "."
@@ -118,7 +115,7 @@ _stop() {
             fail "timeout: Failed to stop wrapper! (pid: $pid)"
         else
             echo " done"
-            [[ "$1" = 'start' ]] && _start
+            #[[ "$1" = 'start' ]] && _start
         fi
     else
         echo "I2P Router is not running."
@@ -128,10 +125,9 @@ _stop() {
 _graceful() {
     if [[ "$pid" ]]; then
         echo -n "Graceful shutdown initiated"
-        kill -HUP "$pid"
-        [[ $? != 0 ]] && fail "Unable to stop I2P Router."
+        kill -HUP "$pid" || fail "Unable to stop I2P Router."
         i=0
-        while [[ "$pid" || $i > 660 ]]; do
+        while [[ "$pid" || $i -gt 660 ]]; do
             echo -n "."
             sleep 1
             [[ ! $(get_pid) ]] && unset pid
@@ -150,9 +146,8 @@ _graceful() {
 _dump() {
     if [[ "$pid" ]]; then
         echo "Dumping threads..."
-        kill -QUIT "$pid"
-        [[ $? != 0 ]] &&
-            fail "Failed to dump threads" || echo "Thread Dump is available in wrapper.log"
+        kill -QUIT "$pid" || fail "Failed to dump threads"
+        echo "Thread Dump is available in wrapper.log"
     else
         echo "I2P Router is not running."
     fi