Updates

PDowney · web-flow · commit 79f1d597718e · 2025-11-05T15:16:56.000-05:00
Changes find command to better handle directories and files.
diff --git a/.github/workflows/enginescript-build-test.yml b/.github/workflows/enginescript-build-test.yml
@@ -171,7 +171,7 @@ jobs:
           
           # Set directory and file permissions
           echo "🔧 Setting permissions..." | sudo tee -a /tmp/ci-logs/setup.log
-          sudo find /usr/local/bin/enginescript -type d,f -exec chmod 755 {} \; 2>&1 | sudo tee -a /tmp/ci-logs/setup.log
+          sudo find /usr/local/bin/enginescript -exec chmod 755 {} \; 2>&1 | sudo tee -a /tmp/ci-logs/setup.log
           sudo chown -R root:root /usr/local/bin/enginescript 2>&1 | sudo tee -a /tmp/ci-logs/setup.log
           sudo find /usr/local/bin/enginescript -type f -iname "*.sh" -exec chmod +x {} \; 2>&1 | sudo tee -a /tmp/ci-logs/setup.log
           echo "✅ Permissions set correctly" | sudo tee -a /tmp/ci-logs/setup.log
diff --git a/scripts/functions/backup/daily-database-backup.sh b/scripts/functions/backup/daily-database-backup.sh
@@ -64,6 +64,6 @@ do
     fi
 
   # Remove Old Backups
-    find "/home/EngineScript/site-backups/$i/database/daily" -type d,f -mtime +30 | xargs rm -fR
-    find "/home/EngineScript/site-backups/$i/wp-config" -type d,f -mtime +30 | xargs rm -fR
+    find "/home/EngineScript/site-backups/$i/database/daily" -mtime +30 | xargs rm -fR
+    find "/home/EngineScript/site-backups/$i/wp-config" -mtime +30 | xargs rm -fR
 done
diff --git a/scripts/functions/backup/hourly-database-backup.sh b/scripts/functions/backup/hourly-database-backup.sh
@@ -56,6 +56,6 @@ do
     fi
 
     # Remove Old Backups
-    find "/home/EngineScript/site-backups/$i/database/hourly" -type d,f -mtime +1 | xargs rm -fR
+    find "/home/EngineScript/site-backups/$i/database/hourly" -mtime +1 | xargs rm -fR
 
 done
diff --git a/scripts/functions/backup/weekly-wp-content-backup.sh b/scripts/functions/backup/weekly-wp-content-backup.sh
@@ -55,5 +55,5 @@ do
     fi
 
       # Remove Old Backups
-    find "/home/EngineScript/site-backups/$i/wp-content" -type d,f -mtime +7 | xargs rm -fR
+    find "/home/EngineScript/site-backups/$i/wp-content" -mtime +7 | xargs rm -fR
 done
diff --git a/scripts/functions/cron/permissions.sh b/scripts/functions/cron/permissions.sh
@@ -58,7 +58,7 @@ chmod 770 /run/redis/redis-server.sock 2>/dev/null || true
 dos2unix /usr/local/bin/enginescript/*
 
 # Set directory and file permissions to 755
-find /usr/local/bin/enginescript -type d,f -exec chmod 755 {} \;
+find /usr/local/bin/enginescript -exec chmod 755 {} \;
 
 # Set ownership
 chown -R root:root /usr/local/bin/enginescript
diff --git a/scripts/functions/shared/enginescript-common.sh b/scripts/functions/shared/enginescript-common.sh
@@ -473,9 +473,9 @@ function set_nginx_permissions() {
 # ----------------------------------------------------------------
 # Set permissions for PHP directories and files
 function set_php_permissions() {
-    find "/var/log/php" -type d,f -exec chmod 775 {} \;
-    find "/var/log/opcache" -type d,f -exec chmod 775 {} \;
-    find "/etc/php" -type d,f -exec chmod 775 {} \;
+    find "/var/log/php" -exec chmod 775 {} \;
+    find "/var/log/opcache" -exec chmod 775 {} \;
+    find "/etc/php" -exec chmod 775 {} \;
     chmod 775 /var/cache/opcache
     chmod 775 /var/cache/php-sessions
     chmod 775 /var/cache/wsdlcache
diff --git a/scripts/install/depends/depends-install.sh b/scripts/install/depends/depends-install.sh
@@ -169,9 +169,5 @@ apt install -qy $packages || {
 # Nano
 update-alternatives --set editor /bin/nano
 
-# Cheat.sh
-#curl https://cht.sh/:cht.sh | sudo tee /usr/local/bin/cht.sh
-#chmod +x /usr/local/bin/cht.sh
-
 # Mark the installation as complete
 echo "DEPENDS=1" >> /var/log/EngineScript/install-log.log
diff --git a/scripts/install/enginescript-install.sh b/scripts/install/enginescript-install.sh
@@ -27,7 +27,7 @@ dos2unix /home/EngineScript/enginescript-install-options.txt
 dos2unix /usr/local/bin/enginescript/*
 
 # Set directory and file permissions to 755
-find /usr/local/bin/enginescript -type d,f -exec chmod 755 {} \;
+find /usr/local/bin/enginescript -exec chmod 755 {} \;
 
 # Set ownership
 chown -R root:root /usr/local/bin/enginescript
diff --git a/scripts/install/kernel/kernel-tweaks-install.sh b/scripts/install/kernel/kernel-tweaks-install.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-#!/usr/bin/env bash
 #----------------------------------------------------------------------------------
 # EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
 #----------------------------------------------------------------------------------
diff --git a/scripts/install/redis/redis-install.sh b/scripts/install/redis/redis-install.sh
@@ -24,10 +24,8 @@ apt install -qy redis redis-server redis-tools
 # Setup Redis
 #mkdir -p /run/redis
 #mkdir -p /var/lib/redis
-#mkdir -p /var/log/redis
 touch /var/log/redis/redis-server.log
-find /var/lib/redis -type d,f -exec chmod 775 {} \;
-find /var/lib/redis -type d,f -exec chmod 775 {} \;
+find /var/lib/redis -type d -o -type f -exec chmod 775 {} \;
 chmod 775 /run/redis
 chmod 775 /var/lib/redis
 chmod 775 /var/log/redis
@@ -75,6 +73,8 @@ systemctl daemon-reload
 restart_service "redis-server"
 systemctl enable redis-server
 
+sleep 3
+
 # Ensure correct socket ownership and permissions
 chown redis:redis /run/redis/redis-server.sock 2>/dev/null || true
 chmod 770 /run/redis/redis-server.sock 2>/dev/null || true
diff --git a/scripts/install/tools/media/zimageoptimizer.sh b/scripts/install/tools/media/zimageoptimizer.sh
@@ -28,7 +28,7 @@ fi
 
 # Install 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 {} \;
+find "/usr/local/bin/zimageoptimizer" -exec chmod 755 {} \;
 
 # 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
@@ -30,7 +30,7 @@ fi
 git clone https://github.com/testssl/testssl.sh.git /usr/local/bin/testssl.sh
 
 # Permissions
-find /usr/local/bin/testssl.sh -type d,f -exec chmod 755 {} \;
+find /usr/local/bin/testssl.sh -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 {} \;
 
diff --git a/setup.sh b/setup.sh
@@ -91,7 +91,7 @@ git clone https://github.com/EngineScript/EngineScript.git -b master /usr/local/
 dos2unix /usr/local/bin/enginescript/*
 
 # Set directory and file permissions to 755
-find /usr/local/bin/enginescript -type d,f -exec chmod 755 {} \;
+find /usr/local/bin/enginescript -exec chmod 755 {} \;
 
 # Set ownership
 chown -R root:root /usr/local/bin/enginescript

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`		`-#!/usr/bin/env bash`
`3`	`2`	`#----------------------------------------------------------------------------------`
`4`	`3`	`# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare`
`5`	`4`	`#----------------------------------------------------------------------------------`