Software Deploy Progress

src/homestead/samples/repopush.sh

@@ -10,7 +10,6 @@ HOMEDIR="~/homestead/code"
 # Installation sub-directory within synched virtual server
 INSTDIR="survloop"
 
-
 rm -r $HOMEDIR/$INSTDIR/vendor/rockhopsoft/survloop/src
 cp -r $REPODIR/survloop/src $HOMEDIR/$INSTDIR/vendor/rockhopsoft/survloop/
 
@@ -21,6 +20,6 @@ rm -r $HOMEDIR/$INSTDIR/app/Models/*
 
 cd $HOMEDIR/$INSTDIR/
 composer dump-autoload
-php artisan optimize:clear
 echo "0" | php artisan vendor:publish --force
-curl http://$DIR/css-reload
+php artisan optimize:clear
+curl http://$INSTDIR.local/css-reload

src/homestead/samples/repos-make-zips.sh

@@ -5,7 +5,7 @@ set -x
 REPODIR="~/repos"
 
 # Package name of Survloop extension
-REPONAME="survlooporg"
+PCKGNAME="survlooporg"
 
 cd $REPODIR
 rm -r zipz-repos
@@ -19,6 +19,6 @@ cd $REPODIR/survloop-libraries
 tar -czvf survloop-libraries.tar.gz ./src
 mv survloop-libraries.tar.gz ../zipz-repos/survloop-libraries.tar.gz
 
-cd $REPODIR/$REPONAME
-tar -czvf $REPONAME.tar.gz ./src
-mv $REPONAME.tar.gz ../zipz-repos/$REPONAME.tar.gz
+cd $REPODIR/$PCKGNAME
+tar -czvf $PCKGNAME.tar.gz ./src
+mv $PCKGNAME.tar.gz ../zipz-repos/$PCKGNAME.tar.gz

src/homestead/survloop-mac.sh

@@ -38,6 +38,13 @@ if [ "$NOPCKG" == "n" ]; then
     echo "Package Class: $PCKGCLASS"
 fi
 echo '=============================='
+
+sed -i "s/INSTDIR='survloop'/INSTDIR='$DIR'/g" install-scripts/src/homestead/samples/*.sh
+sed -i "s/SUPUSER='survuser'/SUPUSER='$SUPUSER'/g" install-scripts/src/homestead/samples/*.sh
+sed -i "s/PCKGVEND='rockhopsoft'/PCKGVEND='$PCKGVEND'/g" install-scripts/src/homestead/samples/*.sh
+sed -i "s/PCKGNAME='survlooporg'/PCKGNAME='$PCKGNAME'/g" install-scripts/src/homestead/samples/*.sh
+sed -i "s/PCKGCLASS='SurvloopOrg'/PCKGCLASS='$PCKGCLASS'/g" install-scripts/src/homestead/samples/*.sh
+
 if [ $# -eq 1 ]; then
     set -x
 fi
@@ -67,7 +74,7 @@ if [ -d "./$DIR/orig.env" ]; then
     rm -f ./$DIR/orig.env
 fi
 mv ./$DIR/.env ./$DIR/orig.env
-cp ./install-scripts/homestead/samples/survloop.env $DIR/env.txt
+cp ./install-scripts/src/homestead/samples/survloop.env $DIR/env.txt
 if [ "$NOPCKG" == "n" ]; then
     perl -pi -w -e "s/APP_NAME=Survloop/APP_NAME=$PCKGCLASS/g" $DIR/env.txt
     perl -pi -w -e "s/survloop.local/$DIR.local/g" $DIR/env.txt

src/ubuntu20/survloop/02-survloop.sh

@@ -8,7 +8,7 @@ if [ $# -eq 0 ]; then
     echo '---------------------'
     echo 'To run this with all commands printing to the screen,'
     echo 'cancel this (Ctrl+C), and re-run this script with any parameter:'
-    echo '# bash /root/install-scripts/ubuntu20/survloop/02-survloop.sh debug'
+    echo '# bash /root/install-scripts/src/ubuntu20/survloop/02-survloop.sh debug'
 fi
 echo '====================='
 echo ''
@@ -63,7 +63,7 @@ ufw allow 'Nginx HTTPS'
 echo "y" | ufw enable
 echo "Y" | apt install zip unzip php-fpm php-mysql php-mbstring php-xml php-bcmath php7.4-zip php7.4-gd ghostscript
 systemctl reload nginx
-cp /root/install-scripts/ubuntu20/survloop/samples/nginx-example.com /etc/nginx/sites-available/$DIR
+cp /root/install-scripts/src/ubuntu20/survloop/samples/nginx-example.com /etc/nginx/sites-available/$DIR
 sed -i "s/example.com/$DIR/g" /etc/nginx/sites-available/$DIR
 sed -i "s/server.ip.address/$IP/g" /etc/nginx/sites-available/$DIR
 #nano /etc/nginx/sites-available/$DIR
@@ -183,16 +183,15 @@ echo '--------'
 echo 'Create Super User Deployment Tools'
 echo '=================================='
 mkdir /home/$SUPUSER/survloop/
-cp /root/install-scripts/ubuntu20/survloop/samples/deploy-update-from-staging.sh /home/$SUPUSER/survloop/deploy-update-from-staging.sh
-cp /root/install-scripts/ubuntu20/survloop/samples/deploy-update-from-space.sh /home/$SUPUSER/survloop/deploy-update-from-space.sh
-cp /root/install-scripts/ubuntu20/survloop/samples/deploy-update-core.sh /home/$SUPUSER/survloop/deploy-update-core.sh
-cp /root/install-scripts/ubuntu20/survloop/samples/deploy-update-dirs.sh /home/$SUPUSER/survloop/deploy-update-dirs.sh
+cp /root/install-scripts/src/ubuntu20/survloop/samples/deploy-update-*.sh /home/$SUPUSER/survloop/
 
-#sed -i "s/SurvloopOrg/$PCKGCLASS/g" /home/$SUPUSER/survloop/deploy-update-from-space.sh
-sed -i "s/SurvloopOrg/$PCKGCLASS/g" /home/$SUPUSER/survloop/deploy-update-from-space.sh
+sed -i "s/DIR='survloop.org'/DIR='$DIR'/g" /home/$SUPUSER/survloop/*.sh
+sed -i "s/SUPUSER='survuser'/SUPUSER='$SUPUSER'/g" /home/$SUPUSER/survloop/*.sh
+sed -i "s/PCKGVEND='rockhopsoft'/PCKGVEND='$PCKGVEND'/g" /home/$SUPUSER/survloop/*.sh
+sed -i "s/PCKGNAME='survlooporg'/PCKGNAME='$PCKGNAME'/g" /home/$SUPUSER/survloop/*.sh
 
-cp /root/install-scripts/ubuntu20/survloop/samples/maintenance-mode.sh /home/$SUPUSER/survloop/maintenance-mode.sh
-cp /root/install-scripts/ubuntu20/survloop/samples/maintenance-index.php /home/$SUPUSER/survloop/maintenance-index.php
+cp /root/install-scripts/src/ubuntu20/survloop/samples/maintenance-mode.sh /home/$SUPUSER/survloop/maintenance-mode.sh
+cp /root/install-scripts/src/ubuntu20/survloop/samples/maintenance-index.php /home/$SUPUSER/survloop/maintenance-index.php
 mkdir /home/$SUPUSER/staging/
 mkdir /home/$SUPUSER/staging/rockhopsoft
 mkdir /home/$SUPUSER/staging/rockhopsoft/survloop

src/ubuntu20/survloop/samples/deploy-update-core.sh

@@ -5,16 +5,16 @@ echo 'Deploying Code from Staging Directory...'
 set -x
 
 DIR="$1"
-SUPUSER="rocky"
-PCKGA="rockhopsoft"
-PCKGB="rockhopsoftcom"
+SUPUSER='survuser'
+PCKGVEND='rockhopsoft'
+PCKGNAME='survlooporg'
 
 set +x
 
 echo 'Making Copies From Staging...'
 cp -r /home/$SUPUSER/staging/rockhopsoft/survloop/src /tmp/staging/rockhopsoft/survloop
 cp -r /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src /tmp/staging/rockhopsoft/survloop-libraries
-cp -r /home/$SUPUSER/staging/$PCKGA/$PCKGB/src /tmp/staging/$PCKGA/$PCKGB
+cp -r /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/src /tmp/staging/$PCKGVEND/$PCKGNAME
 
 set -x
 
@@ -26,9 +26,9 @@ rm -r /tmp/backup/rockhopsoft/survloop-libraries/src
 mv /var/www/$DIR/vendor/rockhopsoft/survloop-libraries/src /tmp/backup/rockhopsoft/survloop-libraries
 mv /tmp/staging/rockhopsoft/survloop-libraries/src /var/www/$DIR/vendor/rockhopsoft/survloop-libraries
 
-rm -r /tmp/backup/$PCKGA/$PCKGB/src
-mv /var/www/$DIR/vendor/$PCKGA/$PCKGB/src /tmp/backup/$PCKGA/$PCKGB
-mv /tmp/staging/$PCKGA/$PCKGB/src /var/www/$DIR/vendor/$PCKGA/$PCKGB
+rm -r /tmp/backup/$PCKGVEND/$PCKGNAME/src
+mv /var/www/$DIR/vendor/$PCKGVEND/$PCKGNAME/src /tmp/backup/$PCKGVEND/$PCKGNAME
+mv /tmp/staging/$PCKGVEND/$PCKGNAME/src /var/www/$DIR/vendor/$PCKGVEND/$PCKGNAME
 
 set +x
 
@@ -43,9 +43,9 @@ fi
 set -x
 
 cd /var/www/$DIR
-php artisan optimize:clear
 composer dump-autoload
 echo "0" | php artisan vendor:publish --force
+php artisan optimize:clear
 curl http://$DIR/css-reload
 
 set +x

src/ubuntu20/survloop/samples/deploy-update-dirs.sh

@@ -2,9 +2,9 @@
 # Check deployment directories...
 set +x
 
-SUPUSER="rocky"
-PCKGA="rockhopsoft"
-PCKGB="rockhopsoftcom"
+SUPUSER='survuser'
+PCKGVEND='rockhopsoft'
+PCKGNAME='survlooporg'
 
 if [ ! -d /home/$SUPUSER/staging ]; then
     mkdir /home/$SUPUSER/staging
@@ -18,8 +18,8 @@ fi
 if [ ! -d /home/$SUPUSER/staging/rockhopsoft/survloop-libraries ]; then
     mkdir /home/$SUPUSER/staging/rockhopsoft/survloop-libraries
 fi
-if [ ! -d /home/$SUPUSER/staging/$PCKGA/$PCKGB ]; then
-    mkdir /home/$SUPUSER/staging/$PCKGA/$PCKGB
+if [ ! -d /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME ]; then
+    mkdir /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME
 fi
 chown -R $SUPUSER:$SUPUSER /home/$SUPUSER/staging
 
@@ -35,8 +35,8 @@ fi
 if [ ! -d /tmp/backup/rockhopsoft/survloop-libraries ]; then
     mkdir /tmp/backup/rockhopsoft/survloop-libraries
 fi
-if [ ! -d /tmp/backup/$PCKGA/$PCKGB ]; then
-    mkdir /tmp/backup/$PCKGA/$PCKGB
+if [ ! -d /tmp/backup/$PCKGVEND/$PCKGNAME ]; then
+    mkdir /tmp/backup/$PCKGVEND/$PCKGNAME
 fi
 
 if [ ! -d /tmp/staging ]; then
@@ -51,6 +51,6 @@ fi
 if [ ! -d /tmp/staging/rockhopsoft/survloop-libraries ]; then
     mkdir /tmp/staging/rockhopsoft/survloop-libraries
 fi
-if [ ! -d /tmp/staging/$PCKGA/$PCKGB ]; then
-    mkdir /tmp/staging/$PCKGA/$PCKGB
+if [ ! -d /tmp/staging/$PCKGVEND/$PCKGNAME ]; then
+    mkdir /tmp/staging/$PCKGVEND/$PCKGNAME
 fi

src/ubuntu20/survloop/samples/deploy-update-from-sftp.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -x
 
-DIR="survloop.org"
-SUPUSER="survuser"
-PCKGA="rockhopsoft"
-PCKGB="survlooporg"
+DIR='survloop.org'
+SUPUSER='survuser'
+PCKGVEND='rockhopsoft'
+PCKGNAME='survlooporg'
 
 if [ $# -eq 1 ]; then
     DIR="$DIR-production"
@@ -14,24 +14,14 @@ bash /home/$SUPUSER/survloop/deploy-update-dirs.sh
 
 set +x 
 
-if [ -d /home/$SUPUSER/staging/rockhopsoft/survloop/src ]; then
-    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop/src
-fi
-if [ -d /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src ]; then
-    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src
-fi
-if [ -d /home/$SUPUSER/staging/$PCKGA/$PCKGB/src ]; then
-    rm -R /home/$SUPUSER/staging/$PCKGA/$PCKGB/src
-fi
-
 if [ -f /home/$SUPUSER/staging/rockhopsoft/survloop/survloop.tar.gz ]; then
-    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop/src
+    rm /home/$SUPUSER/staging/rockhopsoft/survloop/survloop.tar.gz
 fi
 if [ -f /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/survloop-libraries.tar.gz ]; then
-    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src
+    rm /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/survloop-libraries.tar.gz
 fi
-if [ -f /home/$SUPUSER/staging/$PCKGA/$PCKGB/$PCKGB.tar.gz ]; then
-    rm -R /home/$SUPUSER/staging/$PCKGA/$PCKGB/$PCKGB.tar.gz
+if [ -f /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/$PCKGNAME.tar.gz ]; then
+    rm /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/$PCKGNAME.tar.gz
 fi
 
 echo '--'
@@ -44,14 +34,24 @@ echo "put survloop.tar.gz /home/$SUPUSER/staging/rockhopsoft/survloop/survloop.t
 echo ""
 echo "put survloop-libraries.tar.gz /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/survloop-libraries.tar.gz"
 echo ""
-echo "put $PCKGB.tar.gz /home/$SUPUSER/staging/$PCKGA/$PCKGB/$PCKGB.tar.gz"
+echo "put $PCKGNAME.tar.gz /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/$PCKGNAME.tar.gz"
 echo ""
 echo ""
 read -p $'Have you uploaded with SFTP?\n("y" or "n") \n' DONE
 
-tar -C /home/$SUPUSER/staging/rockhopsoft/survloop/ -xz /home/$SUPUSER/staging/rockhopsoft/survloop/survloop.tar.gz --warning=none
-tar -C /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/ -xz /home/$SUPUSER/staging/rockhopsoft/survloop/survloop-libraries.tar.gz --warning=none
-tar -C /home/$SUPUSER/staging/$PCKGA/$PCKGB/ -xz /home/$SUPUSER/staging/$PCKGA/$PCKGB/$PCKGB.tar.gz --warning=none
+if [ -d /home/$SUPUSER/staging/rockhopsoft/survloop/src ]; then
+    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop/src
+fi
+if [ -d /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src ]; then
+    rm -R /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src
+fi
+if [ -d /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/src ]; then
+    rm -R /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/src
+fi
+
+tar -C /home/$SUPUSER/staging/rockhopsoft/survloop/ -zxvf /home/$SUPUSER/staging/rockhopsoft/survloop/survloop.tar.gz --warning=none
+tar -C /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/ -zxvf /home/$SUPUSER/staging/rockhopsoft/survloop/survloop-libraries.tar.gz --warning=none
+tar -C /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/ -zxvf /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/$PCKGNAME.tar.gz --warning=none
 
 bash /home/$SUPUSER/survloop/deploy-update-core.sh $DIR
 

src/ubuntu20/survloop/samples/deploy-update-from-space.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 set -x
 
-DIR="rockhopsoft.com"
-SUPUSER="rocky"
-PCKGA="rockhopsoft"
-PCKGB="rockhopsoftcom"
+DIR='survloop.org'
+SUPUSER='survuser'
+PCKGVEND='rockhopsoft'
+PCKGNAME='survlooporg'
 
 if [ $# -eq 1 ]; then
     DIR="$DIR-production"
@@ -20,8 +20,8 @@ fi
 if [ -d /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src ]; then
     rm -R /home/$SUPUSER/staging/rockhopsoft/survloop-libraries/src
 fi
-if [ -d /home/$SUPUSER/staging/$PCKGA/$PCKGB/src ]; then
-    rm -R /home/$SUPUSER/staging/$PCKGA/$PCKGB/src
+if [ -d /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/src ]; then
+    rm -R /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME/src
 fi
 
 echo ''
@@ -36,8 +36,8 @@ wget -c https://space.survloop.org/repos/survloop.tar.gz -O - | tar -xz --warnin
 cd /home/$SUPUSER/staging/rockhopsoft/survloop-libraries
 wget -c https://space.survloop.org/repos/survloop-libraries.tar.gz -O - | tar -xz --warning=none
 
-cd /home/$SUPUSER/staging/$PCKGA/$PCKGB
-wget -c https://space.survloop.org/repos/$PCKGB.tar.gz -O - | tar -xz --warning=none
+cd /home/$SUPUSER/staging/$PCKGVEND/$PCKGNAME
+wget -c https://space.survloop.org/repos/$PCKGNAME.tar.gz -O - | tar -xz --warning=none
 
 set +x 
 

src/ubuntu20/survloop/samples/deploy-update-from-staging.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
 
-DIR="rockhopsoft.com"
+DIR='survloop.org'
 
 if [ $# -eq 1 ]; then
     DIR="$DIR-production"

src/ubuntu20/survloop/samples/maintenance-mode.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -x
 
-DIR=survloop.org
+DIR='survloop.org'
 
 if [ $1 = 'on' ]
 then