Skip to content

Commit fcc8104

Browse files
PDowneyPDowney
committed
Updates
1 parent 59365dc commit fcc8104

20 files changed

Lines changed: 40 additions & 37 deletions

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -933,3 +933,10 @@ function safe_wget() {
933933
return 1
934934
}
935935
}
936+
937+
938+
# ----------------------------------------------------------------
939+
# Safely return to /usr/src
940+
function return_to_src() {
941+
cd /usr/src || { echo "Error: Failed to change to /usr/src" >&2; exit 1; }
942+
}

‎scripts/install/liburing/liburing-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
1919
# Start Main Script
2020

2121
# Return to /usr/src
22-
cd /usr/src
22+
return_to_src
2323

2424
# Official liburing Download
2525
download_and_extract "https://github.com/axboe/liburing/archive/refs/tags/liburing-${LIBURING_VER}.tar.gz" "/usr/src/liburing-${LIBURING_VER}.tar.gz"
@@ -40,4 +40,4 @@ make install
4040
#make install
4141

4242
# Return to /usr/src
43-
cd /usr/src
43+
return_to_src

‎scripts/install/nginx/nginx-brotli.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
1919
# Start Main Script
2020

2121
# Return to /usr/src
22-
cd /usr/src
22+
return_to_src
2323

2424
# Brotli
2525

@@ -35,4 +35,4 @@ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS="-Ofast
3535
cmake --build . --config Release --target brotlienc
3636

3737
# Return to /usr/src
38-
cd /usr/src
38+
return_to_src

‎scripts/install/nginx/nginx-compile.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,4 +255,4 @@ strip -s /usr/sbin/nginx*
255255
checksec --format=json --file="/usr/sbin/nginx" --extended | jq -r
256256

257257
# Return to /usr/src
258-
cd /usr/src
258+
return_to_src

‎scripts/install/openssl/openssl-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
1818
#----------------------------------------------------------------------------------
1919
# Start Main Script
2020

21-
# Return to /usr/src directory
22-
cd /usr/src
21+
# Return to /usr/src
22+
return_to_src
2323

2424
# Download and extract OpenSSL
2525
download_and_extract "https://github.com/openssl/openssl/releases/download/openssl-${OPENSSL_VER}/openssl-${OPENSSL_VER}.tar.gz" "/usr/src/openssl-${OPENSSL_VER}.tar.gz" || { echo "Error: Failed to download/extract OpenSSL."; exit 1; }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
1919
# Start Main Script
2020

2121
# Return to /usr/src
22-
cd /usr/src
22+
return_to_src
2323

2424
# Create control-panel directory if it doesn't exist
2525
mkdir -p /var/www/admin/control-panel
@@ -52,4 +52,4 @@ done
5252
set_enginescript_frontend_permissions
5353

5454
# Return to /usr/src
55-
cd /usr/src
55+
return_to_src

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ echo "<?php phpinfo(); ?>" > /var/www/admin/tools/phpinfo/index.php
3232
set_enginescript_frontend_permissions
3333

3434
# Return to /usr/src
35-
cd /usr/src
35+
return_to_src

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ sed -i "s|SEDPHPVER|${PHP_VER}|g" /var/www/admin/tools/phpsysinfo/phpsysinfo.ini
3434
set_enginescript_frontend_permissions
3535

3636
# Return to /usr/src
37-
cd /usr/src
37+
return_to_src

‎scripts/install/tools/frontend/tiny-file-manager-install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ fi
7373
set_enginescript_frontend_permissions
7474

7575
# Return to /usr/src
76-
cd /usr/src
76+
return_to_src

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source /usr/local/bin/enginescript/scripts/functions/shared/enginescript-common.
1919
# Start Main Script
2020

2121
# Return to /usr/src
22-
cd /usr/src
22+
return_to_src
2323

2424
# Install Uptime Robot API Key
2525
# Create Uptime Robot configuration file if it doesn't exist
@@ -33,4 +33,4 @@ fi
3333
set_enginescript_frontend_permissions
3434

3535
# Return to /usr/src
36-
cd /usr/src
36+
return_to_src

0 commit comments

Comments
 (0)