shellcheck style fixesv0.24.12

3 files changed, 12 insertions, 12 deletions

diff --git a/docker/build-container.sh b/docker/build-container.sh
index 7ac041e2..7080ae0b 100644
--- a/docker/build-container.sh
+++ b/docker/build-container.sh
@@ -1,4 +1,4 @@
-#!/bin/bish
+#!/bin/bash
 
 # Build NextCloudPi ARM docker container in a QEMU Raspbian with docker
 #
diff --git a/docker/docker-env.sh b/docker/docker-env.sh
index 0ef112ce..70c9bc04 100644
--- a/docker/docker-env.sh
+++ b/docker/docker-env.sh
@@ -1,4 +1,4 @@
-#!/bin/bish
+#!/bin/bash
 
 # Install docker ARM on Raspbian
 #
diff --git a/docker/run-nc.sh b/docker/run-nc.sh
index eed13840..6f3dcd34 100755
--- a/docker/run-nc.sh
+++ b/docker/run-nc.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+NCDIR=/var/www/nextcloud
+OCC="$NCDIR/www/nextcloud/occ"
+
 cleanup()
 {
   apachectl graceful-stop
@@ -34,29 +37,26 @@ test -d /data/app || {
   activate_script /usr/local/etc/nextcloudpi-config.d/nc-init.sh
 
   # COPY DATADIR TO /data, WHICH WILL BE IN A PERSISTENT VOLUME
-  cd /var/www/nextcloud/
   echo "Setting up persistent data dir..."
-  cp -ra /var/www/nextcloud/data /data/app
-  sudo -u www-data php occ config:system:set datadirectory --value=/data/app
+  cp -ra /"$NCDIR"/data /data/app
+  sudo -u www-data php $OCC config:system:set datadirectory --value=/data/app
 
   # COPY CONFIG TO /data, WHICH WILL BE IN A PERSISTENT VOLUME
   echo "Setting up persistent configuration..."
-  test -e /data/config || mv /var/www/nextcloud/config /data
+  test -e /data/config || mv /"$NCDIR"/config /data
 }
 
 # Use persistent configuration
 test -e /data/config && {
-  rm -rf /var/www/nextcloud/config
-  ln -s /data/config /var/www/nextcloud/config
+  rm -rf /"$NCDIR"/config
+  ln -s /data/config /"$NCDIR"/config
 }
 
-cd /var/www/nextcloud/
-
 # Trusted Domain ( as an argument )
 [[ "$@" != "" ]] && {
   IP=$( grep -oP '\d{1,3}(\.\d{1,3}){3}' <<< "$1" ) # validate that the first argument is a valid IP
   if [[ "$IP" != "" ]]; then
-    sudo -u www-data php occ config:system:set trusted_domains 1 --value=$IP
+    sudo -u www-data php $OCC config:system:set trusted_domains 1 --value="$IP"
   else
     echo "First argument must be an IP address to include as a Trusted domain. Ignoring"
   fi
@@ -65,7 +65,7 @@ cd /var/www/nextcloud/
 # Trusted Domain ( local IP )
 IFACE=$( ip r | grep "default via" | awk '{ print $5 }' )
 IP=$( ip a | grep "global $IFACE" | grep -oP '\d{1,3}(.\d{1,3}){3}' | head -1 )
-sudo -u www-data php occ config:system:set trusted_domains 2 --value=$IP
+sudo -u www-data php $OCC config:system:set trusted_domains 2 --value="$IP"
 
 echo "Starting Apache"
 /usr/sbin/apache2ctl start