Skip to content

Commit 46f199b

Browse files
PDowneyPDowney
authored
Updates
1 parent 6d76eed commit 46f199b

11 files changed

Lines changed: 320 additions & 98 deletions

‎scripts/functions/auto-upgrade/emergency-auto-upgrade.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
source /usr/local/bin/enginescript/enginescript-variables.txt
1212
source /home/EngineScript/enginescript-install-options.txt
1313

14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
1416

1517

1618
#----------------------------------------------------------------------------------
1719
# Start Main Script
1820

19-
2021
# Start Emergency Automatic Upgrade

‎scripts/functions/auto-upgrade/normal-auto-upgrade.sh‎

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
source /usr/local/bin/enginescript/enginescript-variables.txt
1212
source /home/EngineScript/enginescript-install-options.txt
1313

14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
1416

1517

1618
#----------------------------------------------------------------------------------
1719
# Start Main Script
1820

19-
source /usr/local/bin/enginescript/enginescript-variables.txt
20-
source /home/EngineScript/enginescript-install-options.txt
21-
2221
# Check if es.sites alias is missing and add it if needed
2322
if ! grep -q "alias es.sites=" /root/.bashrc; then
2423
echo "Adding missing es.sites alias to /root/.bashrc"
@@ -47,3 +46,56 @@ if [[ -f "$CREDENTIALS_FILE" ]]; then
4746
else
4847
echo "Warning: EngineScript credentials file not found at $CREDENTIALS_FILE"
4948
fi
49+
50+
# Create /etc/enginescript directory if it doesn't exist
51+
if [[ ! -d "/etc/enginescript" ]]; then
52+
echo "Creating EngineScript configuration directory..."
53+
mkdir -p /etc/enginescript
54+
chmod 755 /etc/enginescript
55+
chown www-data:www-data /etc/enginescript
56+
echo "✓ EngineScript configuration directory created"
57+
fi
58+
59+
# Create Uptime Robot configuration file if it doesn't exist
60+
if [[ ! -f "/etc/enginescript/uptimerobot.conf" ]]; then
61+
cp /usr/local/bin/enginescript/config/etc/enginescript/uptimerobot.conf /etc/enginescript/uptimerobot.conf
62+
chmod 600 /etc/enginescript/uptimerobot.conf
63+
chown www-data:www-data /etc/enginescript/uptimerobot.conf
64+
fi
65+
66+
67+
# Create /etc/enginescript directory if it doesn't exist
68+
if [[ ! -d "/etc/enginescript" ]]; then
69+
echo "Creating EngineScript configuration directory..."
70+
mkdir -p "/etc/enginescript"
71+
echo "✓ EngineScript configuration directory created"
72+
fi
73+
74+
# Create /var/www/admin/enginescript/ if it doesn't exist
75+
if [[ ! -d "/var/www/admin/enginescript/" ]]; then
76+
echo "Creating EngineScript admin directory..."
77+
mkdir -p "/var/www/admin/enginescript"
78+
echo "✓ EngineScript admin directory created"
79+
fi
80+
81+
# Admin Control Panel
82+
/usr/local/bin/enginescript/scripts/install/tools/frontend/admin-control-panel-install.sh
83+
84+
# Install phpinfo
85+
/usr/local/bin/enginescript/scripts/install/tools/frontend/phpinfo-install.sh
86+
87+
# Install phpSysinfo
88+
/usr/local/bin/enginescript/scripts/install/tools/frontend/phpsysinfo-install.sh
89+
90+
# Install Tiny File Manager
91+
/usr/local/bin/enginescript/scripts/install/tools/frontend/tiny-file-manager-install.sh
92+
93+
# Install UptimeRobot API
94+
/usr/local/bin/enginescript/scripts/install/tools/frontend/uptimerobit-api-install.sh
95+
96+
# Update configuration files from main credentials file
97+
echo "Updating configuration files with user credentials..."
98+
/usr/local/bin/enginescript/scripts/functions/shared/update-config-files.sh
99+
100+
# Set permissions for EngineScript frontend directories
101+
set_enginescript_frontend_permissions

‎scripts/functions/shared/enginescript-common.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,3 +246,16 @@ function validate_url() {
246246
return 1
247247
fi
248248
}
249+
250+
# Set permissions for EngineScript frontend directories and files
251+
function set_enginescript_frontend_permissions() {
252+
# Set permissions for /var/www/admin/enginescript
253+
find /var/www/admin/enginescript -type d -print0 | sudo xargs -0 chmod 0755
254+
find /var/www/admin/enginescript -type f -print0 | sudo xargs -0 chmod 0644
255+
chown -R www-data:www-data /var/www/admin/enginescript
256+
257+
# Set permissions for /etc/enginescript
258+
find /etc/enginescript -type d -print0 | sudo xargs -0 chmod 0755
259+
find /etc/enginescript -type f -print0 | sudo xargs -0 chmod 0644
260+
chown -R www-data:www-data /etc/enginescript
261+
}

‎scripts/install/tools/frontend/admin-control-panel-install.sh‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env bash
2+
#----------------------------------------------------------------------------------
3+
# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
4+
#----------------------------------------------------------------------------------
5+
# Website: https://EngineScript.com
6+
# GitHub: https://github.com/Enginescript/EngineScript
7+
# License: GPL v3.0
8+
#----------------------------------------------------------------------------------
9+
10+
# EngineScript Variables
11+
source /usr/local/bin/enginescript/enginescript-variables.txt
12+
source /home/EngineScript/enginescript-install-options.txt
13+
14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
16+
17+
18+
#----------------------------------------------------------------------------------
19+
# Start Main Script
20+
21+
# Return to /usr/src
22+
cd /usr/src
23+
24+
# Copy Admin Control Panel
25+
cp -a /usr/local/bin/enginescript/config/var/www/admin/control-panel/. /var/www/admin/enginescript/
26+
27+
# Substitute frontend dependency versions
28+
sed -i "s|{CHARTJS_VER}|${CHARTJS_VER}|g" /var/www/admin/enginescript/index.html
29+
sed -i "s|{FONTAWESOME_VER}|${FONTAWESOME_VER}|g" /var/www/admin/enginescript/index.html
30+
31+
# Remove Adminer tool card if INSTALL_ADMINER=0
32+
if [[ "${INSTALL_ADMINER}" -eq 0 ]]; then
33+
# More robust removal: match any <div> with id="adminer-tool" regardless of attribute order/whitespace
34+
sed -i '/<div[^>]*id="adminer-tool"[^>]*>/,/<\/div>/d' "/var/www/admin/enginescript/index.html"
35+
fi
36+
37+
# Update configuration files from main credentials file
38+
echo "Updating configuration files with user credentials..."
39+
/usr/local/bin/enginescript/scripts/functions/shared/update-config-files.sh
40+
41+
# Set permissions for the EngineScript frontend
42+
set_enginescript_frontend_permissions
43+
44+
# Return to /usr/src
45+
cd /usr/src

‎scripts/install/tools/frontend/phpinfo-install.sh‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#!/usr/bin/env bash
2+
#----------------------------------------------------------------------------------
3+
# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
4+
#----------------------------------------------------------------------------------
5+
# Website: https://EngineScript.com
6+
# GitHub: https://github.com/Enginescript/EngineScript
7+
# License: GPL v3.0
8+
#----------------------------------------------------------------------------------
9+
10+
# EngineScript Variables
11+
source /usr/local/bin/enginescript/enginescript-variables.txt
12+
source /home/EngineScript/enginescript-install-options.txt
13+
14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
16+
17+
18+
#----------------------------------------------------------------------------------
19+
# Start Main Script
20+
21+
# Remove existing phpinfo directory if it exists
22+
if [[ -d "/var/www/admin/enginescript/phpinfo" ]]; then
23+
rm -rf "/var/www/admin/enginescript/phpinfo"
24+
fi
25+
26+
# Create phpinfo directory and file
27+
mkdir -p "/var/www/admin/enginescript/phpinfo"
28+
echo "<?php phpinfo(); ?>" > /var/www/admin/enginescript/phpinfo/index.php
29+
30+
# Set permissions for the EngineScript frontend
31+
set_enginescript_frontend_permissions
32+
33+
# Return to /usr/src
34+
cd /usr/src

‎scripts/install/tools/frontend/phpsysinfo-install.sh‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env bash
2+
#----------------------------------------------------------------------------------
3+
# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
4+
#----------------------------------------------------------------------------------
5+
# Website: https://EngineScript.com
6+
# GitHub: https://github.com/Enginescript/EngineScript
7+
# License: GPL v3.0
8+
#----------------------------------------------------------------------------------
9+
10+
# EngineScript Variables
11+
source /usr/local/bin/enginescript/enginescript-variables.txt
12+
source /home/EngineScript/enginescript-install-options.txt
13+
14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
16+
17+
18+
#----------------------------------------------------------------------------------
19+
# Start Main Script
20+
21+
# phpSysinfo
22+
# Remove existing phpSysinfo directory if it exists
23+
if [[ -d "/var/www/admin/enginescript/phpsysinfo" ]]; then
24+
rm -rf /var/www/admin/enginescript/phpsysinfo
25+
fi
26+
27+
# Clone the phpSysinfo repository
28+
git clone --depth 1 https://github.com/phpsysinfo/phpsysinfo.git /var/www/admin/enginescript/phpsysinfo
29+
cp -rf /usr/local/bin/enginescript/config/var/www/admin/phpsysinfo/phpsysinfo.ini /var/www/admin/enginescript/phpsysinfo/phpsysinfo.ini
30+
sed -i "s|SEDPHPVER|${PHP_VER}|g" /var/www/admin/enginescript/phpsysinfo/phpsysinfo.ini
31+
32+
# Set permissions for the EngineScript frontend
33+
set_enginescript_frontend_permissions
34+
35+
# Return to /usr/src
36+
cd /usr/src

scripts/install/tools/system/admin-control-panel.sh renamed to scripts/install/tools/frontend/tiny-file-manager.sh

Lines changed: 8 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,13 @@
1111
source /usr/local/bin/enginescript/enginescript-variables.txt
1212
source /home/EngineScript/enginescript-install-options.txt
1313

14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
1416

1517

1618
#----------------------------------------------------------------------------------
1719
# Start Main Script
1820

19-
# Return to /usr/src
20-
cd /usr/src
21-
22-
# phpSysinfo
23-
# Remove existing phpSysinfo directory if it exists
24-
if [[ -d "/var/www/admin/enginescript/phpsysinfo" ]]; then
25-
rm -rf /var/www/admin/enginescript/phpsysinfo
26-
fi
27-
28-
# Clone phpSysinfo
29-
git clone --depth 1 https://github.com/phpsysinfo/phpsysinfo.git /var/www/admin/enginescript/phpsysinfo
30-
cp -rf /usr/local/bin/enginescript/config/var/www/admin/phpsysinfo/phpsysinfo.ini /var/www/admin/enginescript/phpsysinfo/phpsysinfo.ini
31-
sed -i "s|SEDPHPVER|${PHP_VER}|g" /var/www/admin/enginescript/phpsysinfo/phpsysinfo.ini
32-
33-
# PHPinfo.php
34-
mkdir -p /var/www/admin/enginescript/phpinfo
35-
echo "<?php phpinfo(); ?>" > /var/www/admin/enginescript/phpinfo/index.php
36-
37-
# Admin Control Panel
38-
cp -a /usr/local/bin/enginescript/config/var/www/admin/control-panel/. /var/www/admin/enginescript/
39-
40-
# Substitute frontend dependency versions
41-
sed -i "s|{CHARTJS_VER}|${CHARTJS_VER}|g" /var/www/admin/enginescript/index.html
42-
sed -i "s|{FONTAWESOME_VER}|${FONTAWESOME_VER}|g" /var/www/admin/enginescript/index.html
43-
44-
# Ensure API file is in the correct location for nginx routing
45-
# The nginx config expects /enginescript/api.php for API calls
46-
# Keep the original api.php in place for direct access
47-
4821
# Download and install official Tiny File Manager from GitHub
4922
echo "Installing official Tiny File Manager from GitHub..."
5023
TFM_DIR="/var/www/admin/enginescript/tinyfilemanager"
@@ -56,8 +29,10 @@ if [[ -d "$TFM_DIR" ]]; then
5629
rm -rf "$TFM_DIR"
5730
fi
5831

59-
# Create TFM directory
60-
mkdir -p "$TFM_DIR"
32+
# Create TFM directory if it doesn't exist
33+
if [[ ! -d "$TFM_DIR" ]]; then
34+
mkdir -p "$TFM_DIR"
35+
fi
6136

6237
# Download and extract TFM with error handling
6338
if curl -fsSL --connect-timeout 30 --max-time 60 "${TFM_ZIP_URL}" -o "${TFM_ZIP_FILE}"; then
@@ -92,37 +67,8 @@ else
9267
echo "⚠ Warning: Failed to download Tiny File Manager from GitHub"
9368
fi
9469

95-
# Create /etc/enginescript directory if it doesn't exist
96-
if [[ ! -d "/etc/enginescript" ]]; then
97-
echo "Creating EngineScript configuration directory..."
98-
mkdir -p /etc/enginescript
99-
chmod 755 /etc/enginescript
100-
chown -R www-data:www-data /var/www/admin/enginescript
101-
chown -R www-data:www-data /etc/enginescript
102-
103-
echo "✓ EngineScript configuration directory created"
104-
fi
105-
106-
# Create Uptime Robot configuration file if it doesn't exist
107-
if [[ ! -f "/etc/enginescript/uptimerobot.conf" ]]; then
108-
cp /usr/local/bin/enginescript/config/etc/enginescript/uptimerobot.conf /etc/enginescript/uptimerobot.conf
109-
chmod 600 /etc/enginescript/uptimerobot.conf
110-
chown -R www-data:www-data /etc/enginescript/uptimerobot.conf
111-
fi
112-
113-
# Remove Adminer tool card if INSTALL_ADMINER=0
114-
if [[ "${INSTALL_ADMINER}" -eq 0 ]]; then
115-
sed -i '/<div class="tool-card" data-tool="adminer" id="adminer-tool">/,/<\/div>/d' "/var/www/admin/enginescript/index.html"
116-
fi
117-
118-
# Set Permissions
119-
find /var/www/admin/enginescript -type d -print0 | sudo xargs -0 chmod 0755
120-
find /var/www/admin/enginescript -type f -print0 | sudo xargs -0 chmod 0644
121-
chown -R www-data:www-data /var/www/admin/enginescript
122-
123-
# Update configuration files from main credentials file
124-
echo "Updating configuration files with user credentials..."
125-
/usr/local/bin/enginescript/scripts/functions/shared/update-config-files.sh
70+
# Set permissions for the EngineScript frontend
71+
set_enginescript_frontend_permissions
12672

12773
# Return to /usr/src
12874
cd /usr/src

‎scripts/install/tools/frontend/uptimerobot-api-install.sh‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/usr/bin/env bash
2+
#----------------------------------------------------------------------------------
3+
# EngineScript - A High-Performance WordPress Server Built on Ubuntu and Cloudflare
4+
#----------------------------------------------------------------------------------
5+
# Website: https://EngineScript.com
6+
# GitHub: https://github.com/Enginescript/EngineScript
7+
# License: GPL v3.0
8+
#----------------------------------------------------------------------------------
9+
10+
# EngineScript Variables
11+
source /usr/local/bin/enginescript/enginescript-variables.txt
12+
source /home/EngineScript/enginescript-install-options.txt
13+
14+
# Source shared functions library
15+
source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.sh
16+
17+
18+
#----------------------------------------------------------------------------------
19+
# Start Main Script
20+
21+
# Return to /usr/src
22+
cd /usr/src
23+
24+
# Install Uptime Robot API Key
25+
# Create Uptime Robot configuration file if it doesn't exist
26+
if [[ ! -f "/etc/enginescript/uptimerobot.conf" ]]; then
27+
cp /usr/local/bin/enginescript/config/etc/enginescript/uptimerobot.conf /etc/enginescript/uptimerobot.conf
28+
chmod 600 /etc/enginescript/uptimerobot.conf
29+
chown -R www-data:www-data /etc/enginescript/uptimerobot.conf
30+
fi
31+
32+
# Update configuration files from main credentials file
33+
echo "Updating configuration files with user credentials..."
34+
/usr/local/bin/enginescript/scripts/functions/shared/update-config-files.sh
35+
36+
# Set permissions for the EngineScript frontend
37+
set_enginescript_frontend_permissions
38+
39+
# Return to /usr/src
40+
cd /usr/src

0 commit comments

Comments
 (0)