Merge branch 'dev' into beta

Author: hiddify-com

Makefile

@@ -56,8 +56,9 @@ ifeq ($(TAG),)
 	@echo "WARNING: This operation will create s version tag and push to github"
 	@read -p "Version? (provide the next x.y.z semver) : " TAG
 endif
-	@VERSION_STR=$$(echo $$TAG | grep -Eo '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}((b|\.dev)[0-9]{1,2})?') 
+	@VERSION_STR=$$(echo $$TAG | grep -Eo '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}((b)[0-9]{1,2})?') 
 	[ ! -z "$$VERSION_STR" ] || { echo "Incorrect tag. e.g., 1.2.3 or 1.2.3b1"; exit 1; } 
+	@( git checkout beta && git pull && git merge dev ) || ( git checkout dev; echo "error in merging to beta branch"; exit 1 )
 	@echo "$${TAG}" > VERSION 
 	@make -C ./hiddify-panel/src release TAG=$${TAG}
 	@git tag $${TAG} > /dev/null
@@ -68,5 +69,6 @@ endif
 	@echo "creating git tag : v$${TAG}" 
 	@git tag v$${TAG} 
 	@git push -u origin HEAD --tags 
+	@git checkout dev && git merge beta
 	@echo "Github Actions will detect the new tag and release the new version."
 

common/hiddify_installer.sh

@@ -203,7 +203,7 @@ function update_config() {
             echo "DEVELOP: Current Config Version=$current_config_version -- Latest=$latest"
             if [[ "$force" == "true" || "$latest" != "$current_config_version" ]]; then
                 update_progress "Updating..." "Hiddify Config from $current_config_version to $latest" 60
-                update_from_github "hiddify-manager.tar.gz" "https://github.com/hiddify/hiddify-manager/archive/refs/heads/main.tar.gz" $latest
+                update_from_github "hiddify-manager.tar.gz" "https://github.com/hiddify/hiddify-manager/archive/refs/heads/dev.tar.gz" $latest
 
                 update_progress "Updated..." "Hiddify Config to $latest" 100
                 return 0
@@ -256,8 +256,10 @@ function post_update_tasks() {
               systemctl kill -s SIGTERM hiddify-panel
       fi
 
+      if [[ $panel_update == 0 && $config_update != 0 ]]; then
+          bash /opt/hiddify-manager/apply_configs.sh --no-gui --no-log
+      fi
       systemctl start hiddify-panel
-
       cd /opt/hiddify-manager/hiddify-panel
       if [ "$CREATE_EASYSETUP_LINK" == "true" ];then
           hiddify-panel-cli set-setting --key create_easysetup_link --val True
@@ -271,10 +273,6 @@ function post_update_tasks() {
               hiddify-panel-cli set-setting --key package_mode --val develop
           ;;
       esac
-
-      if [[ $panel_update == 0 && $config_update != 0 ]]; then
-          bash /opt/hiddify-manager/apply_configs.sh --no-gui --no-log
-      fi
     fi
 }
 

common/package_manager.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 SCRIPT_DIR="$(dirname "$BASH_SOURCE")"
 
-# echo $SCRIPT_DIR && exit 1
+if [[ *develop* != $(realpath $SCRIPT_DIR) ]];then 
+    SCRIPT_DIR="/opt/hiddify-manager/common/"
+fi
 
 source $SCRIPT_DIR/utils.sh
 # File to store package information
 PACKAGES_LOCK="$SCRIPT_DIR/packages.lock"
 CURRENT_PACKAGES="$SCRIPT_DIR/packages.db"
+touch $CURRENT_PACKAGES
 
 # Function to calculate file hash
 generate_hash() {

hiddify-panel/install.sh

@@ -32,8 +32,6 @@ if [ -n "$HIDDIFY_PANLE_SOURCE_DIR" ]; then
     uv pip install -e "$HIDDIFY_PANLE_SOURCE_DIR"
 fi
 
-systemctl daemon-reload >/dev/null 2>&1
-
 rm -rf /etc/cron.d/{hiddify_usage_update,hiddify_auto_backup}
 # echo "*/1 * * * * root $(pwd)/update_usage.sh" >/etc/cron.d/hiddify_usage_update
 # echo "0 */6 * * * hiddify-panel $(pwd)/backup.sh" >/etc/cron.d/hiddify_auto_backup

hiddify-panel/run.sh

@@ -42,10 +42,11 @@ if [ -f "../config.env" ]; then
     #su hiddify-panel -c "hiddifypanel import-config -c $(pwd)/../config.env"
 
     if [ "$?" == 0 ]; then
-        rm -f ../config.env
+        mv ../config.env ../config.env.old
         # echo "temporary disable removing config.env"
     fi
 fi
+hiddify-panel-cli init-db
 
 systemctl start hiddify-panel.service
 systemctl restart hiddify-panel-background-tasks.service

hiddify-panel/src

@@ -31,9 +31,9 @@ function main() {
     if [ "$DO_NOT_INSTALL" == "true" ];then
         PROGRESS_ACTION="Applying..."
     fi
-    if [ "$HIDDIFY_DEBUG" = "1" ]; then
-        export USE_VENV=313
-    fi
+
+    export USE_VENV=313
+
     install_python
     activate_python_venv
 

install.sh

@@ -59,13 +59,8 @@ if ! grep -q "^[^#]*bind-address\s*=\s*127.0.0.1" "$MARIADB_CONF"; then
     fi
     echo "bind-address set to 127.0.0.1 in $MARIADB_CONF"
 
-    # Restart the MariaDB service
-    if systemctl is-active --quiet mariadb; then
-        sudo systemctl restart mariadb
-        echo "MariaDB service restarted"
-    else
-        echo "MariaDB service is not running. Please start it manually."
-    fi
+    sudo systemctl restart mariadb
+    
 fi
 
 systemctl start mariadb

other/mysql/install.sh

@@ -43,27 +43,31 @@ function main() {
     echo "Creating a backup ..."
     ./hiddify-panel/backup.sh
 
+    update_script="https://raw.githubusercontent.com/hiddify/Hiddify-Manager/refs/heads/main/common/download.sh"
     case "$package_mode" in
     develop)
         # Use the latest commit from GitHub
         latest_panel=$(get_commit_version Hiddify-Panel)
         latest_manager=$(get_commit_version hiddify-manager)
+        update_script="https://raw.githubusercontent.com/hiddify/Hiddify-Manager/refs/heads/dev/common/download.sh"
         ;;
     beta)
         latest_panel=$(get_pre_release_version hiddify-panel)
         latest_manager=$(get_pre_release_version hiddify-manager)
+        update_script="https://raw.githubusercontent.com/hiddify/Hiddify-Manager/refs/heads/beta/common/download.sh"
         ;;
     release)
         latest_panel=$(get_release_version hiddify-panel)
         latest_manager=$(get_release_version hiddify-manager)
+        update_script="https://raw.githubusercontent.com/hiddify/Hiddify-Manager/refs/heads/main/common/download.sh"
         ;;
     esac
 
     [[ "$latest_panel" != "$current_panel_version" ]] && panel_update=1
     [[ "$latest_manager" != "$current_config_version" ]] && manager_update=1
     echo "$package_mode Latest panel version: $latest_panel Installed: $current_panel_version Lastest manager version: $latest_manager Installed: $current_config_version"
     if [[ "$force" == "true" || $panel_update == 1 || $manager_update == 1 ]]; then
-        bash <(curl -sSL https://raw.githubusercontent.com/hiddify/hiddify-config/main/common/download.sh) "$package_mode" "$force" "--no-gui" "--no-log"
+        bash <(curl -sSL $update_script) "$package_mode" "$force" "--no-gui" "--no-log"
     else
         echo "Nothing to update"
     fi