Fix issue with filemanger install

bin/v-add-sys-filemanager

@@ -23,8 +23,8 @@ MODE=$1
 user="admin"
 
 FM_INSTALL_DIR="$HESTIA/web/fm"
-FM_FILE="filegator_v${fm_v}.zip"
-FM_URL="https://github.com/filegator/filegator/releases/download/v${fm_v}/${FM_FILE}"
+FM_FILE="v${fm_v}.zip"
+FM_URL="https://github.com/filegator/filegator/archive/refs/tags/${FM_FILE}"
 COMPOSER_BIN="$HOMEDIR/$user/.composer/composer"
 
 #----------------------------------------------------------#
@@ -72,8 +72,8 @@ cd "$FM_INSTALL_DIR"
 [ ! -f "${FM_INSTALL_DIR}/${FM_FILE}" ] && wget "$FM_URL" --quiet -O "${FM_INSTALL_DIR}/${FM_FILE}"
 
 unzip -qq "${FM_INSTALL_DIR}/${FM_FILE}"
-mv --force ${FM_INSTALL_DIR}/filegator/* "${FM_INSTALL_DIR}"
-rm --recursive --force ${FM_INSTALL_DIR}/filegator
+mv --force ${FM_INSTALL_DIR}/filegator-${fm_v}/* "${FM_INSTALL_DIR}"
+rm --recursive --force ${FM_INSTALL_DIR}/filegator-${fm_v}
 [[ -f "${FM_INSTALL_DIR}/${FM_FILE}" ]] && rm "${FM_INSTALL_DIR}/${FM_FILE}"
 
 cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTALL_DIR}"

install/deb/filemanager/filegator/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2804e81bca9a58669546bcb9ce9ff709",
+    "content-hash": "8e2ae21876c09c77b9450d8c53abdf95",
     "packages": [
         {
             "name": "dibi/dibi",
@@ -76,44 +76,6 @@
             },
             "time": "2022-01-19T17:38:15+00:00"
         },
-        {
-            "name": "hestiacp/phpquoteshellarg",
-            "version": "v1.0.1-p3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hestiacp/phpquoteshellarg.git",
-                "reference": "89cbab9b81b4482127a7bd521ccb6394dd8cda37"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hestiacp/phpquoteshellarg/zipball/89cbab9b81b4482127a7bd521ccb6394dd8cda37",
-                "reference": "89cbab9b81b4482127a7bd521ccb6394dd8cda37",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/Hestiacp/quoteshellarg/quoteshellarg.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "Unlicense"
-            ],
-            "description": "Improved escape shell arguments for support of special charactars",
-            "homepage": "https://github.com/hestiacp",
-            "keywords": [
-                "escapeshellarg",
-                "quoteshellarg"
-            ],
-            "support": {
-                "source": "https://github.com/hestiacp/phpquoteshellarg/tree/v1.0.1-p3"
-            },
-            "time": "2022-07-17T14:48:05+00:00"
-        },
         {
             "name": "league/flysystem",
             "version": "1.1.10",

install/deb/filemanager/install-fm.sh

@@ -44,8 +44,8 @@ if [ "$fm_error" != "yes" ]; then
         wget "$FM_URL" --quiet -O "${FM_INSTALL_DIR}/${FM_FILE}"
 
     unzip -qq "${FM_INSTALL_DIR}/${FM_FILE}"
-    mv --force ${FM_INSTALL_DIR}/filegator/* "${FM_INSTALL_DIR}"
-    rm --recursive --force ${FM_INSTALL_DIR}/filegator
+    mv --force ${FM_INSTALL_DIR}/filegator-${fm_v}/* "${FM_INSTALL_DIR}"
+    rm --recursive --force ${FM_INSTALL_DIR}/filegator-${fm_v}
     [[ -f "${FM_INSTALL_DIR}/${FM_FILE}" ]] && rm "${FM_INSTALL_DIR}/${FM_FILE}"
 
     cp --recursive --force ${HESTIA_INSTALL_DIR}/filemanager/filegator/* "${FM_INSTALL_DIR}"