Updated Brotli Setup

PDowney · PDowney · commit 6a266c6c78fa · 2024-12-13T19:27:59.000-05:00
Brotli was failing due to a few reasons. Pushed through code to cd to 
/usr/src before and after we enter git directories just to be safe.
diff --git a/scripts/install/liburing/liburing-install.sh b/scripts/install/liburing/liburing-install.sh
@@ -22,9 +22,16 @@ fi
 
 #----------------------------------------------------------------------------
 # Start Main Script
+
+# Return to /usr/src
+cd /usr/src
+
 rm -rf /usr/src/liburing
 git clone --depth 1 https://github.com/axboe/liburing -b master /usr/src/liburing
 cd /usr/src/liburing
 make -j${CPU_COUNT}
 #make test
 make install
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/nginx/nginx-brotli.sh b/scripts/install/nginx/nginx-brotli.sh
@@ -23,13 +23,20 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
 # Brotli
+
+# Old Git Method
 rm -rf /usr/src/ngx_brotli
-git clone https://github.com/google/ngx_brotli.git -b master /usr/src/ngx_brotli
+git clone --recurse-submodules --remote-submodules https://github.com/google/ngx_brotli.git /usr/src/ngx_brotli
 cd /usr/src/ngx_brotli
 git submodule update --init
 
-cd usr/src/ngx_brotli/deps/brotli
+cd /usr/src/ngx_brotli/deps/brotli
 mkdir out && cd out
 cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS="-Ofast -m64 -march=native -mtune=native -flto -funroll-loops -ffunction-sections -fdata-sections -Wl,--gc-sections" -DCMAKE_CXX_FLAGS="-Ofast -m64 -march=native -mtune=native -flto -funroll-loops -ffunction-sections -fdata-sections -Wl,--gc-sections" -DCMAKE_INSTALL_PREFIX=./installed ..
 cmake --build . --config Release --target brotlienc
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/media/zimageoptimizer.sh b/scripts/install/tools/media/zimageoptimizer.sh
@@ -23,7 +23,13 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
+
 # Install zImageOptimizer
 rm -rf /usr/local/bin/zimageoptimizer
 git clone --depth 1 https://github.com/zevilz/zImageOptimizer.git -b master /usr/local/bin/zimageoptimizer
 find /usr/local/bin/zimageoptimizer -type d,f -exec chmod 755 {} \;
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/php/opcache-gui.sh b/scripts/install/tools/php/opcache-gui.sh
@@ -23,6 +23,12 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
+
 # OpCache-GUI
 rm -rf /var/www/admin/enginescript/opcache-gui
 git clone --depth 1 https://github.com/amnuts/opcache-gui.git /var/www/admin/enginescript/opcache-gui
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/security/php-malware-finder.sh b/scripts/install/tools/security/php-malware-finder.sh
@@ -23,6 +23,9 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
+
 # PHP Malware Finder
 rm -rf /usr/local/bin/php-malware-finder
 git clone https://github.com/nbs-system/php-malware-finder.git /usr/local/bin/php-malware-finder
@@ -38,3 +41,6 @@ echo ""
 echo ""
 
 sleep 5
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/system/dropbox-uploader.sh b/scripts/install/tools/system/dropbox-uploader.sh
@@ -22,7 +22,12 @@ fi
 
 #----------------------------------------------------------------------------
 # Start Main Script
+
+# Return to /usr/src
+cd /usr/src
+
 clear
+
 # Clone Git
 git clone --depth 1 https://github.com/andreafabrizi/Dropbox-Uploader.git -b master /usr/local/bin/dropbox-uploader
 
@@ -36,3 +41,6 @@ echo "We've sent the dropbox_uploader.sh script to your Dropbox folder. If it di
 /usr/local/bin/dropbox-uploader/dropbox_uploader.sh -k upload /usr/local/bin/dropbox-uploader/dropbox_uploader.sh .
 
 echo "Check your Dropbox"
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/system/phpsysinfo.sh b/scripts/install/tools/system/phpsysinfo.sh
@@ -23,6 +23,9 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
+
 # phpSysinfo
 rm -rf /var/www/admin/enginescript/phpsysinfo
 git clone --depth 1 https://github.com/phpsysinfo/phpsysinfo.git /var/www/admin/enginescript/phpsysinfo
@@ -48,3 +51,6 @@ echo ""
 echo ""
 
 sleep 5
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/tools/system/testssl-install.sh b/scripts/install/tools/system/testssl-install.sh
@@ -23,6 +23,9 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
+# Return to /usr/src
+cd /usr/src
+
 # Remove Old Version
 rm -rf /usr/local/bin/testssl.sh
 
@@ -33,3 +36,6 @@ git clone https://github.com/drwetter/testssl.sh.git /usr/local/bin/testssl.sh
 find /usr/local/bin/testssl.sh -type d,f -exec chmod 755 {} \;
 chown -R root:root /usr/local/bin/testssl.sh
 find /usr/local/bin/testssl.sh -type f -iname "*.sh" -exec chmod +x {} \;
+
+# Return to /usr/src
+cd /usr/src
diff --git a/scripts/install/zlib/zlib-install.sh b/scripts/install/zlib/zlib-install.sh
@@ -23,8 +23,10 @@ fi
 #----------------------------------------------------------------------------
 # Start Main Script
 
-# Cloudflare zlib Download
+# Return to /usr/src
 cd /usr/src
+
+# Cloudflare zlib Download
 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
@@ -53,3 +55,6 @@ make -f Makefile.in distclean
 # Official zlib Download
 wget -O /usr/src/zlib-${ZLIB_VER}.tar.gz https://www.zlib.net/zlib-${ZLIB_VER}.tar.gz --no-check-certificate
 tar -xzvf /usr/src/zlib-${ZLIB_VER}.tar.gz
+
+# Return to /usr/src
+cd /usr/src
