fix repo path

luochongjun · Apr 29, 2022 · ee373de · ee373de
1 parent 98c6d45
commit ee373de
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/luci/luci-app-store/Makefile b/luci/luci-app-store/Makefile
@@ -10,7 +10,7 @@ LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
 LUCI_DEPENDS:=+curl +opkg  +tar
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.8-9
+PKG_VERSION:=0.1.8-10
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 

diff --git a/luci/luci-app-store/root/bin/is-opkg b/luci/luci-app-store/root/bin/is-opkg
@@ -10,11 +10,12 @@ OPKG_CONF_DIR=${IS_ROOT}/etc/opkg
 APP_LIST_FILE=/etc/istore/app.list
 BACKUP_CONFIG_FILE=/etc/config/istore
 FEEDS_SERVER=https://istore.linkease.com/repo
+GL_FEEDS_SERVER=https://fw.gl-inet.com/releases/istore
 ARCH=`jsonfilter -i /etc/.app_store.id -e '$.arch'`
 
 # for istore self upgrade
 ISTORE_PKG=luci-app-store
-ISTORE_INDEX=https://istore.linkease.com/repo/all/store/Packages.gz
+ISTORE_INDEX=${GL_FEEDS_SERVER}/all/store/Packages.gz
 
 action=${1}
 shift
@@ -55,6 +56,9 @@ update() {
       fcurl -o ${OPKG_CONF_DIR}/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" || \
       return 1
 
+    fcurl -o ${OPKG_CONF_DIR}/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" || \
+    fcurl -o ${OPKG_CONF_DIR}/arch.conf "${GL_FEEDS_SERVER}/${ARCH}/isfeeds.conf"
+
     opkg -f ${IS_ROOT}/etc/opkg_o.conf --offline-root ${IS_ROOT} update
 
     return 0