Quellcode durchsuchen

Merge pull request #2102 from jaapmarcus/fix/2101-hestia-var-missing

Include $HESTIA check in all packages
Jaap Marcus vor 4 Jahren
Ursprung
Commit
6d16aada24
3 geänderte Dateien mit 13 neuen und 1 gelöschten Zeilen
  1. 1 1
      func/upgrade.sh
  2. 6 0
      src/deb/nginx/postinst
  3. 6 0
      src/deb/php/postinst

+ 1 - 1
func/upgrade.sh

@@ -209,7 +209,7 @@ upgrade_send_notification_to_email () {
         echo "- Check our forums for possible solutions: https://forum.hestiacp.com" >> $message_tmp_file
         echo "- File an issue report on GitHub: https://github.com/hestiacp/hestiacp/issues" >> $message_tmp_file
         echo "" >> $message_tmp_file
-        echo "Help support the Hestia Control Panel project by donating via PayPal: https://www.hestiacp.com/donate" >> $message_tmp_file"
+        echo "Help support the Hestia Control Panel project by donating via PayPal: https://www.hestiacp.com/donate" >> $message_tmp_file
         echo "==================================================="  >> $message_tmp_file
         echo "Have a wonderful day," >> $message_tmp_file
         echo "The Hestia Control Panel development team" >> $message_tmp_file

+ 6 - 0
src/deb/nginx/postinst

@@ -19,6 +19,12 @@ fi
 #                Initialize functions/variables               #
 ###############################################################
 
+if [ -z "$HESTIA" ]; then
+    export HESTIA='/usr/local/hestia'
+    PATH=$PATH:/usr/local/hestia/bin
+    export PATH
+fi
+
 # Load upgrade functions and variables
 source /usr/local/hestia/func/main.sh
 source /usr/local/hestia/func/upgrade.sh

+ 6 - 0
src/deb/php/postinst

@@ -15,6 +15,12 @@ fi
 #                Initialize functions/variables               #
 ###############################################################
 
+if [ -z "$HESTIA" ]; then
+    export HESTIA='/usr/local/hestia'
+    PATH=$PATH:/usr/local/hestia/bin
+    export PATH
+fi
+
 # Load upgrade functions and variables
 source /usr/local/hestia/func/main.sh
 source /usr/local/hestia/func/upgrade.sh