Move cgi files to scripts folder

T-REX-XP · Sep 18, 2024 · 3bc9fde · 3bc9fde
1 parent 5f3b5b6
commit 3bc9fde
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = rr-manager
 SPK_VERS = 2.0
-SPK_REV = 70
+SPK_REV = 71
 SPK_ICON = src/rr-manager.png
 
 DSM_UI_DIR = ui
@@ -65,20 +65,20 @@ rr-manager_extra_install:
 
 	install -m 755 -d $(STAGING_DIR)/ui/
 	install -m 755 -d $(STAGING_DIR)/ui/libs/	
-	install -m 755 -d $(STAGING_DIR)/ui/webapi/	
+	install -m 755 -d $(STAGING_DIR)/ui/scripts/	
 	install -m 755 -d $(STAGING_DIR)/ui/images/
 	install -m 755 -d $(STAGING_DIR)/ui/images/1x
 
-	install -m 755 src/webapi/checkUpdateStatus.cgi $(STAGING_DIR)/ui/webapi/checkUpdateStatus.cgi
-	install -m 755 src/webapi/getAddons.cgi $(STAGING_DIR)/ui/webapi/getAddons.cgi
-	install -m 755 src/webapi/getAvailableUpdates.cgi $(STAGING_DIR)/ui/webapi/getAvailableUpdates.cgi	
-	install -m 755 src/webapi/getConfig.cgi $(STAGING_DIR)/ui/webapi/getConfig.cgi
-	install -m 755 src/webapi/getModules.cgi $(STAGING_DIR)/ui/webapi/getModules.cgi
-	install -m 755 src/webapi/getNetworkInfo.cgi $(STAGING_DIR)/ui/webapi/getNetworkInfo.cgi
-	install -m 755 src/webapi/getRrReleaseInfo.cgi $(STAGING_DIR)/ui/webapi/getRrReleaseInfo.cgi
-	install -m 755 src/webapi/readUpdateFile.cgi $(STAGING_DIR)/ui/webapi/readUpdateFile.cgi
-	install -m 755 src/webapi/uploadConfigFile.cgi $(STAGING_DIR)/ui/webapi/uploadConfigFile.cgi
-	install -m 755 src/webapi/uploadUpdateFileInfo.cgi $(STAGING_DIR)/ui/webapi/uploadUpdateFileInfo.cgi
+	install -m 755 src/scripts/checkUpdateStatus.cgi $(STAGING_DIR)/ui/scripts/checkUpdateStatus.cgi
+	install -m 755 src/scripts/getAddons.cgi $(STAGING_DIR)/ui/scripts/getAddons.cgi
+	install -m 755 src/scripts/getAvailableUpdates.cgi $(STAGING_DIR)/ui/scripts/getAvailableUpdates.cgi	
+	install -m 755 src/scripts/getConfig.cgi $(STAGING_DIR)/ui/scripts/getConfig.cgi
+	install -m 755 src/scripts/getModules.cgi $(STAGING_DIR)/ui/scripts/getModules.cgi
+	install -m 755 src/scripts/getNetworkInfo.cgi $(STAGING_DIR)/ui/scripts/getNetworkInfo.cgi
+	install -m 755 src/scripts/getRrReleaseInfo.cgi $(STAGING_DIR)/ui/scripts/getRrReleaseInfo.cgi
+	install -m 755 src/scripts/readUpdateFile.cgi $(STAGING_DIR)/ui/scripts/readUpdateFile.cgi
+	install -m 755 src/scripts/uploadConfigFile.cgi $(STAGING_DIR)/ui/scripts/uploadConfigFile.cgi
+	install -m 755 src/scripts/uploadUpdateFileInfo.cgi $(STAGING_DIR)/ui/scripts/uploadUpdateFileInfo.cgi
 
 	install -m 644 src/ui/alias.syno-app-portal.RRM.conf $(STAGING_DIR)/ui/alias.syno-app-portal.RRM.conf
 	install -m 644 src/ui/config $(STAGING_DIR)/ui/config

diff --git a/src/conf/privilege_ b/src/conf/privilege_
@@ -29,11 +29,11 @@
     ],
     "executable": [
         {
-            "relpath": "ui/webapi/getConfig.cgi",
+            "relpath": "ui/scripts/getConfig.cgi",
             "run-as": "package"
         },
         {
-            "relpath": "ui/webapi/getAddons.cgi",
+            "relpath": "ui/scripts/getAddons.cgi",
             "run-as": "package"
         }
     ]

diff --git a/src/service-setup.sh b/src/service-setup.sh
@@ -15,7 +15,7 @@ service_postinst ()
 
     echo ${separator}
     echo "Install packages to the app/libs folder"
-    ${SYNOPKG_PKGDEST}/env/bin/pip install --target ${SYNOPKG_PKGDEST}/ui/webapi/libs/ -r ${SYNOPKG_PKGDEST}/share/wheelhouse/requirements.txt
+    ${SYNOPKG_PKGDEST}/env/bin/pip install --target ${SYNOPKG_PKGDEST}/ui/scripts/libs/ -r ${SYNOPKG_PKGDEST}/share/wheelhouse/requirements.txt
 
     echo ${separator}
      if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then

diff --git a/src/src/tabs/addons.js b/src/src/tabs/addons.js
@@ -187,7 +187,7 @@ export default
                 appWindow: this.appWin,
                 restful: true,
                 root: "result",
-                url: `/webman/3rdparty/rr-manager/webapi/getAddons.cgi`,
+                url: `/webman/3rdparty/rr-manager/scripts/getAddons.cgi`,
                 idProperty: "name",
                 fields: [{
                     name: 'name',

diff --git a/src/src/tabs/debug.js b/src/src/tabs/debug.js
@@ -7,7 +7,7 @@ Ext.define("SYNOCOMMUNITY.RRManager.Debug.Main", {
             (this.owner = e.owner),
             this.callParent([this.fillConfig(e)]);
     },
-    _prefix: '/webman/3rdparty/rr-manager/webapi/',
+    _prefix: '/webman/3rdparty/rr-manager/scripts/',
     callCustomScript: function (scriptName) {
 
         return new Promise((resolve, reject) => {

diff --git a/src/src/utils/synoApiProvider.js b/src/src/utils/synoApiProvider.js
@@ -1,7 +1,7 @@
 export default
     SYNOCOMMUNITY.RRManager.SynoApiProvider = {
         sendWebAPI: null,
-        _prefix: '/webman/3rdparty/rr-manager/webapi/',
+        _prefix: '/webman/3rdparty/rr-manager/scripts/',
         init: function (sendWebAPI, findAppWindow) {
             this.sendWebAPI = sendWebAPI;
         },

diff --git a/src/src/utils/updateHelper.js b/src/src/utils/updateHelper.js
@@ -37,7 +37,7 @@ export default
                         self.hideProgressIndicator();
                         self.helper.unmask(self.owner);
                         self.owner.getEl()?.unmask();
-                        self.showMsg(self.helper.formatString(self.helper.V('upload_file_dialog', 'unable_update_rr_msg'), responseText?.error ?? "No response from the webapi/readUpdateFile.cgi script."));
+                        self.showMsg(self.helper.formatString(self.helper.V('upload_file_dialog', 'unable_update_rr_msg'), responseText?.error ?? "No response from the scripts/readUpdateFile.cgi script."));
                         return;
                     }
                     const configName = 'rrUpdateFileVersion';

diff --git a/src/ui/rr-manager.widget.js b/src/ui/rr-manager.widget.js
@@ -168,7 +168,7 @@ Ext.define("SYNOCOMMUNITY.RRManager.Widget", {
             that.sendWebAPI(args);
         });
     },
-    _prefix: '/webman/3rdparty/rr-manager/webapi/',
+    _prefix: '/webman/3rdparty/rr-manager/scripts/',
     callCustomScript: function (scriptName) {
         return new Promise((resolve, reject) => {
             Ext.Ajax.request({