Update versions + Fix bug in v-restore-user (hestiacp#3369)

* Update versions 1.7.1~alpha for main branch

* Fix bug in v-restore-user

grep non such file or directory

* Fix text upgrade message

Author: jaapmarcus

bin/v-restore-user

@@ -350,11 +350,11 @@ if [ "$web" != 'no' ] && [ -n "$WEB_SYSTEM" ]; then
 			if [[ "$file" == *.ca ]] || [[ "$file" == *.crt ]] || [[ "$file" == *.key ]] || [[ "$file" == *.pem ]] || [[ "$file" == *.conf ]]; then
 				continue
 			fi
-			if grep "fastcgi_pass" file; then
+			if grep "fastcgi_pass" "$file"; then
 				# Do not allow to run php under a different user
 				continue
 			fi
-			filename=$(basename $file)
+			filename=$(basename "$file")
 			cp -f "$file" "$HOMEDIR/$user/conf/web/$domain/$filename"
 		done
 

func/upgrade.sh

@@ -551,7 +551,7 @@ upgrade_b2_tool() {
 }
 
 upgrade_cloudflare_ip() {
-	echo "[ * ] Update Cloudflare IP"
+	echo "[ * ] Update Cloudflare IP..."
 	# https://github.com/ergin/nginx-cloudflare-real-ip/
 	CLOUDFLARE_FILE_PATH='/etc/nginx/conf.d/cloudflare.inc'
 	echo "#Cloudflare" > $CLOUDFLARE_FILE_PATH

install/hst-install-debian.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.0'
+HESTIA_INSTALL_VER='1.7.1~alpha'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

install/hst-install-ubuntu.sh

@@ -32,7 +32,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.7.0'
+HESTIA_INSTALL_VER='1.7.1~alpha'
 # Dependencies
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2")
 fpm_v="8.1"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "hestia",
 	"private": true,
-	"version": "1.7.0",
+	"version": "1.7.1~alpha",
 	"description": "An open-source Linux web server control panel.",
 	"repository": "https://github.com/hestiacp/hestiacp",
 	"license": "GPL-3.0-or-later",

src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.7.0
+Version: 1.7.1~alpha
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com