From 1554fe41b7989f27ff026f838f356815cbda5194 Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <a@bayrepo.ru>
Date: Sat, 24 Aug 2024 23:09:09 +0300
Subject: [PATCH] Fixed some errors
---
installer.sh | 12 +++++++++---
src/converter/hestiacp-php-set-ver.go | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/installer.sh b/installer.sh
index 6e42d5c..fb796db 100644
--- a/installer.sh
+++ b/installer.sh
@@ -22,9 +22,15 @@ install)
fi
;;
delete)
- php_sys=$(cat /etc/hestia_php_selector/system/php.path)
- if [ -n "$php_sys" ]; then
- update-alternatives --set php "$php_sys"
+ if [ -e /etc/hestia_php_selector/system/php.path ]; then
+ php_sys=$(cat /etc/hestia_php_selector/system/php.path)
+ if [ -n "$php_sys" ]; then
+ update-alternatives --set php "$php_sys"
+ fi
+ fi
+ update-alternatives --display php | grep hestiacp-php-selector
+ if [ $? -ne 0 ]; then
+ update-alternatives --remove php /usr/bin/hestiacp-php-selector
fi
/usr/bin/hestiacp-php-admin remove-all
;;
diff --git a/src/converter/hestiacp-php-set-ver.go b/src/converter/hestiacp-php-set-ver.go
index b12fdc9..d7c6f5e 100644
--- a/src/converter/hestiacp-php-set-ver.go
+++ b/src/converter/hestiacp-php-set-ver.go
@@ -172,7 +172,7 @@ func setUserPhpPathVer(username string, php_ver string, php_path string) error {
}
}
path_to_php_config := path.Join(root_path, PATH_TO_CONFIG_NAME)
- f, err := os.OpenFile(path_to_php_config, os.O_WRONLY, 0400)
+ f, err := os.OpenFile(path_to_php_config, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0400)
if err != nil {
return err
}