Minor bug fixes

PDowney · PDowney · commit b4dc8bf57363 · 2023-09-18T19:52:27.000-04:00
diff --git a/enginescript-variables.txt b/enginescript-variables.txt
@@ -20,7 +20,7 @@ PHP_VER="8.1"
 PHPMYADMIN_VER="5.2.1"
 PNGOUT_VER="20200115"
 WORDFENCE_CLI_VER="1.0.1"
-ZLIB_VER="1.13"
+ZLIB_VER="1.3"
 
 # Old Software Versions
 OLDPHP="8.0"
diff --git a/scripts/install/alias/enginescript-alias-install.sh b/scripts/install/alias/enginescript-alias-install.sh
@@ -27,7 +27,7 @@ fi
 cat <<EOT >> /root/.bashrc
 alias enginescript="/usr/local/bin/enginescript/scripts/menu/enginescript-menu.sh"
 alias es.backup="/usr/local/bin/enginescript/scripts/functions/alias/alias-cache.sh"
-alias es.cache=/usr/local/bin/enginescript/scripts/functions/alias/alias-virus-scan.sh"
+alias es.cache="/usr/local/bin/enginescript/scripts/functions/alias/alias-virus-scan.sh"
 #alias es.compress="/usr/local/bin/enginescript/scripts/functions/cron/compression-cron.sh"
 alias es.config="nano /home/EngineScript/enginescript-install-options.txt"
 alias es.images="/usr/local/bin/enginescript/scripts/functions/cron/optimize-images.sh"
diff --git a/scripts/install/depends/depends-install.sh b/scripts/install/depends/depends-install.sh
@@ -31,7 +31,6 @@ apt install -qy advancecomp apt-listchanges apt-show-versions apt-transport-http
 
 # Nano
 update-alternatives --set editor /bin/nano
-curl https://raw.githubusercontent.com/scopatz/nanorc/master/install.sh | sh
 
 # Cheat.sh
 #curl https://cht.sh/:cht.sh | sudo tee /usr/local/bin/cht.sh
diff --git a/scripts/install/tools/mysql/phpmyadmin.sh b/scripts/install/tools/mysql/phpmyadmin.sh
@@ -62,5 +62,6 @@ echo ""
 echo "============================================================="
 echo ""
 echo ""
-
+exec env --ignore-environment /bin/bash
+export TERM=vt100
 sleep 5
diff --git a/scripts/install/vhost/vhost-install.sh b/scripts/install/vhost/vhost-install.sh
@@ -447,5 +447,6 @@ echo "        Returning to main menu in 5 seconds."
 echo ""
 echo "============================================================="
 echo ""
-
+exec env --ignore-environment /bin/bash
+export TERM=vt100
 sleep 5
diff --git a/scripts/install/zlib/zlib-install.sh b/scripts/install/zlib/zlib-install.sh
@@ -25,13 +25,14 @@ fi
 # Start Main Script
 
 # Cloudflare zlib Download
+cd /usr/src
 rm -rf /usr/src/zlib-cf
 git clone --depth 1 https://github.com/cloudflare/zlib.git -b gcc.amd64 /usr/src/zlib-cf
 cd /usr/src/zlib-cf
-make -f Makefile.in distclean
-./configure \
+sudo ./configure --prefix=path \
   --static \
   --64
+make -f Makefile.in distclean
 
 #make
 #make test
diff --git a/setup.sh b/setup.sh
@@ -117,10 +117,12 @@ apt-key add jcameron-key.asc
 
 if [ -f "/home/EngineScript/enginescript-install-options.txt" ]
   then
+    clear
     echo ""
     echo ""
     echo ""
     echo "Initial setup is complete."
+    echo ""
     echo "Change the options in /home/EngineScript/enginescript-install-options.txt"
     echo "Edit the file and upload via FTP or run command \"nano /home/EngineScript/enginescript-install-options.txt\""
     echo ""
@@ -129,10 +131,12 @@ if [ -f "/home/EngineScript/enginescript-install-options.txt" ]
     echo ""
   else
     cp -rf /usr/local/bin/enginescript/home/enginescript-install-options.txt /home/EngineScript/enginescript-install-options.txt
+    clear
     echo ""
     echo ""
     echo ""
     echo "Initial setup is complete."
+    echo ""
     echo "Change the options in /home/EngineScript/enginescript-install-options.txt"
     echo "Edit the file and upload via FTP or run command \"nano /home/EngineScript/enginescript-install-options.txt\""
     echo ""
