mirror of
https://github.com/caiwx86/small-packages.git
synced 2026-10-26 19:02:52 +08:00
update 2026-06-17 00:42:25
This commit is contained in:
action committed
1 parent
0bae71881b
commit
3e2b32ac97
30 files changed
+412
-298
No files matched your search
@@ -5,19 +5,21 @@
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI based ipk store
|
||||
LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
|
||||
LUCI_DEPENDS:=+curl +opkg +tar +libuci-lua +mount-utils +luci-lib-taskd
|
||||
LUCI_TITLE:=LuCI based ipk/apk store
|
||||
LUCI_DESCRIPTION:=luci-app-store is a ipk/apk store developed by LinkEase team
|
||||
LUCI_DEPENDS:=+curl +tar +libuci-lua +mount-utils +luci-lib-taskd
|
||||
LUCI_DEPENDS+=$(if $(CONFIG_USE_APK),+apk +luci-compat,+opkg)
|
||||
|
||||
LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
|
||||
LUCI_PKGARCH:=all
|
||||
|
||||
PKG_VERSION:=0.1.34-1
|
||||
PKG_VERSION:=0.2.0-r1
|
||||
# PKG_RELEASE MUST be empty for luci.mk
|
||||
PKG_RELEASE:=
|
||||
|
||||
ISTORE_UI_VERSION:=0.1.32
|
||||
ISTORE_UI_VERSION:=0.2.0
|
||||
ISTORE_UI_RELEASE:=1
|
||||
PKG_HASH:=d4f86a88bfd2d6fdd59d5e7f356c1bd51d333f70271f4f28e45feecee9bc1578
|
||||
PKG_HASH:=01f91eec06a3d9125bd74a9a75e457f4fbb591afd9333bd2e9073c2522b79b3d
|
||||
|
||||
PKG_SOURCE_URL_FILE:=v$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE).tar.gz
|
||||
PKG_SOURCE:=istore-ui-$(PKG_SOURCE_URL_FILE)
|
||||
@@ -27,6 +29,7 @@ PKG_MAINTAINER:=jjm2473 <jjm2473@gmail.com>
|
||||
|
||||
TARGET_CONFIGURE_OPTS= FRONTEND_DIST="$(BUILD_DIR)/istore-ui-$(ISTORE_UI_VERSION)-$(ISTORE_UI_RELEASE)/app-store-ui/src/dist" APP_STORE_VERSION="$(PKG_VERSION)"
|
||||
TARGET_CONFIGURE_OPTS+= SED="$(SED)"
|
||||
TARGET_CONFIGURE_OPTS+= USE_APK="$(CONFIG_USE_APK)"
|
||||
|
||||
define Package/luci-app-store/conffiles
|
||||
/etc/.app_store.id
|
||||
|
||||
@@ -166,6 +166,11 @@ end
|
||||
function store_index()
|
||||
local fs = require "nixio.fs"
|
||||
local features = { "_lua_force_array_" }
|
||||
if fs.access("/etc/apk/arch") then
|
||||
features[#features+1] = "apk"
|
||||
else
|
||||
features[#features+1] = "opkg"
|
||||
end
|
||||
if fs.access("/usr/libexec/istore/backup") then
|
||||
features[#features+1] = "backup"
|
||||
end
|
||||
@@ -251,7 +256,7 @@ function validate_pkgname(val)
|
||||
end
|
||||
|
||||
local function get_installed_and_cache()
|
||||
local metadir = "/usr/lib/opkg/meta"
|
||||
local metadir = "/tmp/run/istore-meta/meta"
|
||||
local cachedir = "/tmp/cache/istore"
|
||||
local cachefile = cachedir .. "/installed.json"
|
||||
local nixio = require "nixio"
|
||||
@@ -321,7 +326,7 @@ local function get_installed_and_cache()
|
||||
end
|
||||
|
||||
function store_action(param)
|
||||
local metadir = "/usr/lib/opkg/meta"
|
||||
local metadir = "/tmp/run/istore-meta/meta"
|
||||
local metapkgpre = "app-meta-"
|
||||
local code, out, err, ret
|
||||
local fs = require "nixio.fs"
|
||||
|
||||
+211
-57
@@ -10,25 +10,46 @@ if [ "${action:0:9}" = "AUTOCONF=" ]; then
|
||||
fi
|
||||
|
||||
IS_ROOT=/tmp/is-root
|
||||
DL_DIR=${IS_ROOT}/tmp/dl
|
||||
LISTS_DIR_O=/tmp/opkg-lists
|
||||
LISTS_DIR=${IS_ROOT}${LISTS_DIR_O}
|
||||
OPKG_CONF_DIR=${IS_ROOT}/etc/opkg
|
||||
OPKG_CONF_DIR_M=${IS_ROOT}/etc/opkg_m
|
||||
FEEDS_SERVER=https://istore.istoreos.com/repo
|
||||
FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo"
|
||||
TMP_SELF_COPY=/var/run/cloned-is-opkg
|
||||
USE_APK=false
|
||||
DISABLE_MIRROR=false
|
||||
ARCH=`sed -n -e 's/^Architecture: *\([^ ]\+\) *$/\1/p' /rom/usr/lib/opkg/info/libc.control /usr/lib/opkg/info/libc.control 2>/dev/null | head -1`
|
||||
if [[ -s /etc/apk/arch ]]; then
|
||||
USE_APK=true
|
||||
fi
|
||||
|
||||
if $USE_APK; then
|
||||
LISTS_DIR=${IS_ROOT}/apk
|
||||
APK_CONF=${IS_ROOT}/etc/apk.conf
|
||||
FEEDS_SERVER=https://istore.istoreos.com/repo-apk
|
||||
FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo-apk"
|
||||
ISTORE_INDEX=$FEEDS_SERVER/all/store/packages.adb
|
||||
META_DIR=/lib/apk
|
||||
|
||||
ARCH=`cat /rom/etc/apk/arch /etc/apk/arch 2>/dev/null | head -1`
|
||||
else
|
||||
LISTS_DIR_O=/tmp/opkg-lists
|
||||
LISTS_DIR=${IS_ROOT}${LISTS_DIR_O}
|
||||
OPKG_CONF_DIR=${IS_ROOT}/etc/opkg
|
||||
OPKG_CONF_DIR_M=${IS_ROOT}/etc/opkg_m
|
||||
FEEDS_SERVER=https://istore.istoreos.com/repo
|
||||
FEEDS_SERVER_MIRRORS="https://repo.istoreos.com/repo"
|
||||
ISTORE_INDEX=$FEEDS_SERVER/all/store/Packages.gz
|
||||
META_DIR=/usr/lib/opkg
|
||||
|
||||
ARCH=`sed -n -e 's/^Architecture: *\([^ ]\+\) *$/\1/p' /rom/usr/lib/opkg/info/libc.control /usr/lib/opkg/info/libc.control 2>/dev/null | head -1`
|
||||
fi
|
||||
|
||||
# for istore self upgrade
|
||||
ISTORE_PKG=luci-app-store
|
||||
ISTORE_DEP_PKGS="luci-lib-taskd luci-lib-xterm taskd"
|
||||
ISTORE_INDEX=https://istore.istoreos.com/repo/all/store/Packages.gz
|
||||
|
||||
NEWLINE=$'\n'
|
||||
|
||||
is_init() {
|
||||
mkdir -p ${DL_DIR} ${LISTS_DIR} ${IS_ROOT}/etc ${IS_ROOT}/var
|
||||
mkdir -p ${LISTS_DIR} ${IS_ROOT}/etc ${IS_ROOT}/var
|
||||
if $USE_APK; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
cat /etc/opkg.conf | grep -Fv lists_dir | grep -Fv check_signature > ${IS_ROOT}/etc/opkg.conf
|
||||
|
||||
@@ -44,35 +65,71 @@ is_init() {
|
||||
[ -e ${IS_ROOT}/var/lock ] || ln -s /var/lock ${IS_ROOT}/var/lock
|
||||
}
|
||||
|
||||
apk_wrap() {
|
||||
APK_CONFIG=${APK_CONF} apk "$@"
|
||||
}
|
||||
|
||||
opkg_wrap() {
|
||||
OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@"
|
||||
}
|
||||
|
||||
opkg_wrap_mirrors() {
|
||||
simple_apk_opkg() {
|
||||
local action="$1"
|
||||
shift
|
||||
if $USE_APK; then
|
||||
case "$action" in
|
||||
"install")
|
||||
action=add
|
||||
;;
|
||||
"remove")
|
||||
action=del
|
||||
;;
|
||||
esac
|
||||
apk_wrap "$action" "$@"
|
||||
else
|
||||
opkg_wrap "$action" "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
do_in_mirrors() {
|
||||
local server
|
||||
local file
|
||||
if ! $DISABLE_MIRROR; then
|
||||
local newpath="/usr/libexec/istore/mirror-bin:$PATH"
|
||||
for server in $FEEDS_SERVER_MIRRORS ; do
|
||||
rm -rf "${OPKG_CONF_DIR_M}" 2>/dev/null
|
||||
mkdir -p "${OPKG_CONF_DIR_M}" 2>/dev/null
|
||||
ls "${OPKG_CONF_DIR}/" | while read; do
|
||||
file="$REPLY"
|
||||
if [ -f "${OPKG_CONF_DIR}/$file" -a "${file: -5}" = ".conf" ]; then
|
||||
sed "s#$FEEDS_SERVER/#$server/#g" "${OPKG_CONF_DIR}/$file" >"${OPKG_CONF_DIR_M}/$file"
|
||||
touch -r "${OPKG_CONF_DIR}/$file" "${OPKG_CONF_DIR_M}/$file" 2>/dev/null
|
||||
else
|
||||
cp -a "${OPKG_CONF_DIR}/$file" "${OPKG_CONF_DIR_M}/"
|
||||
fi
|
||||
done
|
||||
echo "Try mirror server $server"
|
||||
OPKG_CONF_DIR=${OPKG_CONF_DIR_M} opkg -f ${IS_ROOT}/etc/opkg.conf "$@" && return 0
|
||||
PATH="$newpath" IS_ORIG_SERVER=$FEEDS_SERVER IS_MIRROR_SERVER=$server "$@" && return 0
|
||||
done
|
||||
DISABLE_MIRROR=true
|
||||
fi
|
||||
echo "Try origin server $FEEDS_SERVER"
|
||||
OPKG_CONF_DIR=${OPKG_CONF_DIR} opkg -f ${IS_ROOT}/etc/opkg.conf "$@"
|
||||
"$@"
|
||||
}
|
||||
|
||||
apk_wrap_mirrors() {
|
||||
do_in_mirrors apk_wrap "$@"
|
||||
}
|
||||
|
||||
opkg_wrap_mirrors() {
|
||||
do_in_mirrors opkg_wrap "$@"
|
||||
}
|
||||
|
||||
do_install_in_mirrors() {
|
||||
if $USE_APK; then
|
||||
apk_wrap_mirrors add "$@"
|
||||
else
|
||||
opkg_wrap_mirrors install "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
do_upgrade_in_mirrors() {
|
||||
if $USE_APK; then
|
||||
apk_wrap_mirrors upgrade "$@"
|
||||
else
|
||||
opkg_wrap_mirrors upgrade "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
alias fcurl='curl -L --fail --show-error'
|
||||
|
||||
check_space() {
|
||||
@@ -91,14 +148,41 @@ update() {
|
||||
fi
|
||||
|
||||
echo "Fetch feed list for ${ARCH}"
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/meta.conf "${FEEDS_SERVER}/all/meta.conf" && \
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" && \
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" || \
|
||||
return 1
|
||||
if $USE_APK; then
|
||||
rm -rf ${IS_ROOT}/var/tmp ${IS_ROOT}/etc/arch ${IS_ROOT}/etc/istore.pem
|
||||
mkdir -p ${IS_ROOT}/var/tmp
|
||||
fcurl --no-progress-meter -o ${IS_ROOT}/var/tmp/meta.conf "${FEEDS_SERVER}/all/meta.conf" && \
|
||||
fcurl --no-progress-meter -o ${IS_ROOT}/var/tmp/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" && \
|
||||
fcurl --no-progress-meter -o ${IS_ROOT}/var/tmp/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" && \
|
||||
fcurl --no-progress-meter -o ${IS_ROOT}/etc/arch "${FEEDS_SERVER}/${ARCH}/archlist.conf" || \
|
||||
return 1
|
||||
echo "cache-dir $LISTS_DIR" > ${APK_CONF}
|
||||
cat ${IS_ROOT}/var/tmp/arch.conf ${IS_ROOT}/var/tmp/all.conf ${IS_ROOT}/var/tmp/meta.conf >> ${APK_CONF}
|
||||
local line
|
||||
while read -r line; do
|
||||
if [[ -n "$line" ]]; then
|
||||
grep -Fxq "$line" /etc/apk/arch || echo "$line" >> /etc/apk/arch
|
||||
fi
|
||||
done < ${IS_ROOT}/etc/arch
|
||||
sync /etc/apk/arch
|
||||
if [[ ! -s /etc/apk/keys/istore.pem && ! -s /etc/apk/keys/istore-tmp.pem ]]; then
|
||||
fcurl --no-progress-meter -o ${IS_ROOT}/etc/istore.pem "${FEEDS_SERVER}/istore-apk.pem" && \
|
||||
cp -a ${IS_ROOT}/etc/istore.pem /etc/apk/keys/istore-tmp.pem || \
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/meta.conf "${FEEDS_SERVER}/all/meta.conf" && \
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/all.conf "${FEEDS_SERVER}/all/isfeeds.conf" && \
|
||||
fcurl --no-progress-meter -o ${OPKG_CONF_DIR}/arch.conf "${FEEDS_SERVER}/${ARCH}/isfeeds.conf" || \
|
||||
return 1
|
||||
fi
|
||||
|
||||
echo "Update feeds index"
|
||||
opkg -f ${IS_ROOT}/etc/opkg_o.conf --offline-root ${IS_ROOT} update
|
||||
|
||||
if $USE_APK; then
|
||||
apk_wrap update
|
||||
else
|
||||
opkg -f ${IS_ROOT}/etc/opkg_o.conf --offline-root ${IS_ROOT} update
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
@@ -110,9 +194,30 @@ update_if_outdate() {
|
||||
return 0
|
||||
}
|
||||
|
||||
get_online_version() {
|
||||
local index="$1"
|
||||
local pkg="$2"
|
||||
if $USE_APK; then
|
||||
apk --cache-dir $LISTS_DIR --cache-max-age 0 --repositories-file /dev/null --repository "$index" update >/dev/null 2>&1
|
||||
local ver=$(apk --cache-dir $LISTS_DIR --cache-max-age 0 --repositories-file /dev/null --repository "$index" query --available --fields version "$pkg" 2>/dev/null | grep -Fm1 'Version: ' | sed 's/^Version: //')
|
||||
echo "${ver:-0.2.0-r1}"
|
||||
else
|
||||
curl --connect-timeout 2 --max-time 5 -s "$index" | gunzip | grep -FA10 "Package: $pkg" | grep -Fm1 'Version: ' | sed 's/^Version: //'
|
||||
fi
|
||||
}
|
||||
|
||||
get_local_version() {
|
||||
local pkg="$1"
|
||||
if $USE_APK; then
|
||||
apk query --installed --fields version "$pkg" 2>/dev/null | grep -Fm1 'Version: ' | sed 's/^Version: //'
|
||||
else
|
||||
grep -Fm1 'Version: ' /usr/lib/opkg/info/$pkg.control 2>/dev/null | sed 's/^Version: //'
|
||||
fi
|
||||
}
|
||||
|
||||
check_self_upgrade() {
|
||||
local newest=`curl --connect-timeout 2 --max-time 5 -s ${ISTORE_INDEX} | gunzip | grep -FA10 "Package: ${ISTORE_PKG}" | grep -Fm1 'Version: ' | sed 's/^Version: //'`
|
||||
local current=`grep -Fm1 'Version: ' /usr/lib/opkg/info/${ISTORE_PKG}.control | sed 's/^Version: //'`
|
||||
local newest=`get_online_version "$ISTORE_INDEX" "$ISTORE_PKG"`
|
||||
local current=`get_local_version "$ISTORE_PKG"`
|
||||
if [ "v$newest" = "v" -o "v$current" = "v" ]; then
|
||||
echo "Check version failed!" >&2
|
||||
exit 255
|
||||
@@ -124,13 +229,13 @@ check_self_upgrade() {
|
||||
}
|
||||
|
||||
do_self_upgrade_0() {
|
||||
opkg_wrap upgrade ${ISTORE_DEP_PKGS} && opkg_wrap upgrade ${ISTORE_PKG}
|
||||
simple_apk_opkg upgrade ${ISTORE_DEP_PKGS} && simple_apk_opkg upgrade ${ISTORE_PKG}
|
||||
}
|
||||
|
||||
do_self_upgrade() {
|
||||
check_mtime || return 1
|
||||
local newest=`curl --connect-timeout 2 --max-time 5 -s ${ISTORE_INDEX} | gunzip | grep -FA10 "Package: ${ISTORE_PKG}" | grep -Fm1 'Version: ' | sed 's/^Version: //'`
|
||||
local current=`grep -Fm1 'Version: ' /usr/lib/opkg/info/${ISTORE_PKG}.control | sed 's/^Version: //'`
|
||||
local newest=`get_online_version "$ISTORE_INDEX" "$ISTORE_PKG"`
|
||||
local current=`get_local_version "$ISTORE_PKG"`
|
||||
if [ "v$newest" = "v" -o "v$current" = "v" ]; then
|
||||
echo "Check version failed!" >&2
|
||||
return 1
|
||||
@@ -139,7 +244,7 @@ do_self_upgrade() {
|
||||
echo "Already the latest version!" >&2
|
||||
return 1
|
||||
fi
|
||||
if opkg_wrap info ${ISTORE_PKG} | grep -qFm1 "Version: $newest"; then
|
||||
if $USE_APK || opkg_wrap info ${ISTORE_PKG} | grep -qFm1 "Version: $newest"; then
|
||||
do_self_upgrade_0 && return 0
|
||||
update_if_outdate || return 1
|
||||
do_self_upgrade_0
|
||||
@@ -150,7 +255,13 @@ do_self_upgrade() {
|
||||
}
|
||||
|
||||
check_mtime() {
|
||||
find ${OPKG_CONF_DIR}/arch.conf -mtime -1 2>/dev/null | grep -q . || update
|
||||
local file
|
||||
if $USE_APK; then
|
||||
file=${APK_CONF}
|
||||
else
|
||||
file=${OPKG_CONF_DIR}/arch.conf
|
||||
fi
|
||||
find "$file" -mtime -1 2>/dev/null | grep -q . || update
|
||||
}
|
||||
|
||||
wrapped_in_update() {
|
||||
@@ -164,7 +275,7 @@ refresh_installed() {
|
||||
local pkg
|
||||
for pkg in $@; do
|
||||
[[ $pkg == app-meta-* ]] || continue
|
||||
pkg="/usr/lib/opkg/meta/${pkg#app-meta-}.json"
|
||||
pkg="$META_DIR/meta/${pkg#app-meta-}.json"
|
||||
[[ -f "$pkg" ]] && touch "$pkg"
|
||||
done
|
||||
return 0
|
||||
@@ -182,10 +293,10 @@ step_upgrade() {
|
||||
fi
|
||||
done
|
||||
if [ -n "$pkgs" ]; then
|
||||
opkg_wrap_mirrors upgrade $pkgs || return 1
|
||||
do_upgrade_in_mirrors $pkgs || return 1
|
||||
fi
|
||||
if [ -n "$metapkg" ]; then
|
||||
opkg_wrap_mirrors upgrade $metapkg || return 1
|
||||
do_upgrade_in_mirrors $metapkg || return 1
|
||||
refresh_installed $metapkg
|
||||
fi
|
||||
return 0
|
||||
@@ -194,7 +305,7 @@ step_upgrade() {
|
||||
new_upgrade() {
|
||||
check_mtime || return 1
|
||||
local metapkg=`echo "$@" | sed 's/ /\n/g' | grep -F app-meta-`
|
||||
if [ -z "$metapkg" ] || opkg_wrap info $metapkg | grep -qF not-installed ; then
|
||||
if [[ -z "$metapkg" ]] || [[ -z "$(get_local_version $metapkg)" ]]; then
|
||||
true
|
||||
else
|
||||
update_if_outdate
|
||||
@@ -203,7 +314,11 @@ new_upgrade() {
|
||||
}
|
||||
|
||||
remove() {
|
||||
opkg_wrap --autoremove --force-removal-of-dependent-packages remove "$@"
|
||||
if $USE_APK; then
|
||||
apk_wrap del -r "$@"
|
||||
else
|
||||
opkg_wrap --autoremove --force-removal-of-dependent-packages remove "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
autoconf_to_env() {
|
||||
@@ -235,16 +350,29 @@ try_autoconf() {
|
||||
PATH="$CLEANPATH" /usr/libexec/istorea/${ISTORE_AUTOCONF}.sh
|
||||
}
|
||||
|
||||
|
||||
try_upgrade_depends() {
|
||||
local pkg="$1"
|
||||
if [[ $pkg == app-meta-* ]]; then
|
||||
local deps=$(grep '^Depends: ' /usr/lib/opkg/info/$pkg.control | busybox sed -e 's/^Depends: //' -e 's/,/\n/g' -e 's/ //g' | grep -vFw libc | xargs echo)
|
||||
[ -z "$deps" ] || opkg_wrap_mirrors install $deps
|
||||
local deps
|
||||
if $USE_APK; then
|
||||
deps=$(apk --repositories-file /dev/null info -R "$pkg" | tail +2 | grep -vFw libc | xargs echo)
|
||||
else
|
||||
deps=$(grep '^Depends: ' "/usr/lib/opkg/info/$pkg.control" | busybox sed -e 's/^Depends: //' -e 's/,/\n/g' -e 's/ //g' | grep -vFw libc | xargs echo)
|
||||
fi
|
||||
[ -z "$deps" ] || do_install_in_mirrors $deps
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
CMD_INSTALLED="opkg list-installed | cut -d' ' -f1 | sort -u"
|
||||
if $USE_APK; then
|
||||
CMD_INSTALLED="apk --repositories-file /dev/null info | cut -d' ' -f1 | sort -u"
|
||||
CMD_INSTALL="apk add --allow-untrusted"
|
||||
else
|
||||
CMD_INSTALLED="opkg list-installed | cut -d' ' -f1 | sort -u"
|
||||
CMD_INSTALL="opkg install"
|
||||
fi
|
||||
|
||||
dotrun() {
|
||||
local path="$1"
|
||||
[ -f "$path" ] || { echo "file not found: $path" >&2; return 1; }
|
||||
@@ -259,8 +387,8 @@ dotrun() {
|
||||
echo "Executing .run file"
|
||||
chmod 0755 "$path" && "$path"
|
||||
else
|
||||
echo "Installing .ipk file"
|
||||
opkg install "$path"
|
||||
echo "Installing pkg file"
|
||||
$CMD_INSTALL "$path"
|
||||
fi
|
||||
local RET=$?
|
||||
rm -f "$path"
|
||||
@@ -297,6 +425,13 @@ run_records() {
|
||||
echo "]"
|
||||
}
|
||||
|
||||
|
||||
if $USE_APK; then
|
||||
CMD_REMOVE="apk del"
|
||||
else
|
||||
CMD_REMOVE="opkg --autoremove remove"
|
||||
fi
|
||||
|
||||
unrun() {
|
||||
local id="$1"
|
||||
[ -s "/usr/share/istore/run-records/$id.txt" ] || { echo "record not found: $id" >&2; return 1; }
|
||||
@@ -306,9 +441,9 @@ unrun() {
|
||||
local round max_round=6
|
||||
for round in `seq 1 $max_round`; do
|
||||
if [ $round == $max_round ]; then
|
||||
opkg --autoremove remove `cat "/tmp/is-root/tmp/to_unrun_$id.txt"`
|
||||
$CMD_REMOVE `cat "/tmp/is-root/tmp/to_unrun_$id.txt"`
|
||||
else
|
||||
opkg --autoremove remove `cat "/tmp/is-root/tmp/to_unrun_$id.txt"` 2>/dev/null && break
|
||||
$CMD_REMOVE `cat "/tmp/is-root/tmp/to_unrun_$id.txt"` 2>/dev/null && break
|
||||
fi
|
||||
done
|
||||
sh -c "$CMD_INSTALLED" > "/tmp/is-root/tmp/post_unrun_$id.txt"
|
||||
@@ -338,13 +473,19 @@ usage() {
|
||||
echo " do_self_upgrade Upgrade iStore"
|
||||
echo " arch Show libc architecture"
|
||||
echo " opkg sys opkg wrap"
|
||||
echo " dotrun {path} install .run/.ipk"
|
||||
echo " run_records list .run/.ipk install records"
|
||||
echo " del_record {id} delete .run/.ipk install record"
|
||||
echo " unrun {id} Remove installed packages by .run/.ipk"
|
||||
echo " dotrun {path} install .run/.ipk/.apk"
|
||||
echo " run_records list .run/.ipk/.apk install records"
|
||||
echo " del_record {id} delete .run/.ipk/.apk install record"
|
||||
echo " unrun {id} Remove installed packages by .run/.ipk/.apk"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if [[ "$action" = "do_self_upgrade" && "$0" != "$TMP_SELF_COPY" ]]; then
|
||||
echo "copy self $0 to $TMP_SELF_COPY when self upgrade"
|
||||
cp -af "$0" "$TMP_SELF_COPY" || exit 1
|
||||
exec "$TMP_SELF_COPY" do_self_upgrade "$@" || exit 1
|
||||
fi
|
||||
|
||||
is_init >/dev/null 2>&1
|
||||
|
||||
CLEANPATH="$PATH"
|
||||
@@ -363,7 +504,7 @@ case $action in
|
||||
;;
|
||||
"install")
|
||||
check_space
|
||||
wrapped_in_update opkg_wrap_mirrors install "$@" && refresh_installed "$1" && try_upgrade_depends "$1" && try_autoconf
|
||||
wrapped_in_update do_install_in_mirrors "$@" && refresh_installed "$1" && try_upgrade_depends "$1" && try_autoconf
|
||||
;;
|
||||
"autoconf")
|
||||
try_autoconf
|
||||
@@ -375,10 +516,18 @@ case $action in
|
||||
remove "$@" || remove "$@"
|
||||
;;
|
||||
"info")
|
||||
opkg_wrap info "$@"
|
||||
if $USE_APK; then
|
||||
apk_wrap query "$@"
|
||||
else
|
||||
opkg_wrap info "$@"
|
||||
fi
|
||||
;;
|
||||
"list-upgradable")
|
||||
opkg_wrap list-upgradable
|
||||
if $USE_APK; then
|
||||
apk_wrap query --upgradable --summarize package '*'
|
||||
else
|
||||
opkg_wrap list-upgradable
|
||||
fi
|
||||
;;
|
||||
"check_self_upgrade")
|
||||
check_self_upgrade
|
||||
@@ -405,6 +554,11 @@ case $action in
|
||||
"unrun")
|
||||
unrun "$1"
|
||||
;;
|
||||
"link_meta")
|
||||
[[ -d "$META_DIR/meta" ]] || mkdir -p "$META_DIR/meta"
|
||||
mkdir -p /tmp/run/istore
|
||||
ln -sf "$META_DIR" /tmp/run/istore-meta
|
||||
;;
|
||||
*)
|
||||
usage
|
||||
;;
|
||||
|
||||
@@ -7,6 +7,7 @@ boot() {
|
||||
local ARCH=`/bin/is-opkg arch`
|
||||
generate_store_id $ARCH
|
||||
generate_super_arch $ARCH
|
||||
/bin/is-opkg link_meta
|
||||
}
|
||||
|
||||
generate_store_id() {
|
||||
|
||||
@@ -9,4 +9,7 @@ if [ -z "`uci -q get istore.istore.hide_docker`" ] && ! which docker >/dev/null;
|
||||
EOF
|
||||
fi
|
||||
|
||||
# remove tmp keys that used for self-installation, which is not needed after installation
|
||||
rm -f /etc/apk/keys/istore-tmp.pem
|
||||
|
||||
rm -rf /tmp/luci-indexcache /tmp/luci-modulecache
|
||||
@@ -5,11 +5,12 @@
|
||||
IS_ROOT=/tmp/is-backup
|
||||
APP_LIST_FILE=/etc/istore/app.list
|
||||
BACKUP_CONFIG_FILE=/etc/config/istore
|
||||
USE_APK=false
|
||||
[[ -s /etc/apk/arch ]] && USE_APK=true
|
||||
|
||||
action=${1}
|
||||
shift
|
||||
|
||||
|
||||
is_init() {
|
||||
mkdir -p ${IS_ROOT}
|
||||
}
|
||||
@@ -90,23 +91,23 @@ ipk_build() {
|
||||
|
||||
# if arg is NULL, use light backup, otherwise use local backup
|
||||
backup() {
|
||||
[ -n "$1" ] && BACKUP_PATH=$1
|
||||
if [ -n "$1" ]; then
|
||||
if $USE_APK; then
|
||||
echo "does not support apk package manager" >&2
|
||||
exit 1
|
||||
fi
|
||||
BACKUP_PATH=$1
|
||||
fi
|
||||
|
||||
#1.add all istore self data to sysupgrade config file,
|
||||
#sysupgrade will backup/restore it auto when flash new firmware
|
||||
echo "/etc/.app_store.id" > /lib/upgrade/keep.d/luci-app-store
|
||||
cat /usr/lib/opkg/info/luci-app-store.list >> /lib/upgrade/keep.d/luci-app-store
|
||||
echo "/etc/rc.d/S45istore" >> /lib/upgrade/keep.d/luci-app-store
|
||||
echo "/etc/istore/uci-defaults_bak" >> /lib/upgrade/keep.d/luci-app-store
|
||||
echo "${APP_LIST_FILE}" >> /lib/upgrade/keep.d/luci-app-store
|
||||
echo "${BACKUP_CONFIG_FILE}" >> /lib/upgrade/keep.d/luci-app-store
|
||||
|
||||
#write user installed package list to file
|
||||
opkg_list_installed_packages "userinstalled" 2>/dev/null | sort -u > ${IS_ROOT}/user_installed_package.list
|
||||
|
||||
#write installed package list by istore feed to file
|
||||
cat ${IS_ROOT}/user_installed_package.list | \
|
||||
grep '^app-meta-' > ${IS_ROOT}/istore_installed_package.list
|
||||
if $USE_APK; then
|
||||
( cd /lib/apk/packages && ls *.list ) | grep '^app-meta-' | sed 's/.list$//' | sort -u > ${IS_ROOT}/istore_installed_package.list
|
||||
else
|
||||
#write user installed package list to file
|
||||
opkg_list_installed_packages "userinstalled" 2>/dev/null | sort -u > ${IS_ROOT}/user_installed_package.list
|
||||
#write installed package list by istore feed to file
|
||||
cat ${IS_ROOT}/user_installed_package.list | \
|
||||
grep '^app-meta-' > ${IS_ROOT}/istore_installed_package.list
|
||||
fi
|
||||
|
||||
#if no input backup path, only back app.list
|
||||
mkdir -p /etc/istore
|
||||
@@ -186,6 +187,10 @@ backup() {
|
||||
# if arg is NULL, use light backup, otherwise use local backup
|
||||
restore() {
|
||||
if [ -n "$1" ]; then
|
||||
if $USE_APK; then
|
||||
echo "does not support apk package manager" >&2
|
||||
exit 1
|
||||
fi
|
||||
BACKUP_PATH_FILE=$1
|
||||
else
|
||||
echo "install package by ${APP_LIST_FILE}"
|
||||
@@ -233,7 +238,7 @@ restore() {
|
||||
get_support_backup_features() {
|
||||
echo "light_backup"
|
||||
#istore custom img mean support local_backup
|
||||
if [ -f /etc/istore_img_flag ];then
|
||||
if ! $USE_APK; then
|
||||
echo "local_backup"
|
||||
fi
|
||||
}
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
newpath=$(echo ":$PATH:" | sed -e 's#:/usr/libexec/istore/mirror-bin:#:#g' -e 's/^:*//' -e 's/:*$//')
|
||||
[ -z "$newpath" ] && newpath="/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
export PATH="$newpath"
|
||||
|
||||
# if url starts with $IS_ORIG_SERVER, replace it with $IS_MIRROR_SERVER
|
||||
if [ -n "$IS_ORIG_SERVER" ] && [ -n "$IS_MIRROR_SERVER" ]; then
|
||||
for i in "$@"; do
|
||||
if [[ "$i" == "$IS_ORIG_SERVER"* ]]; then
|
||||
set -- "${@/$i/$IS_MIRROR_SERVER${i#$IS_ORIG_SERVER}}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
export -n IS_ORIG_SERVER IS_MIRROR_SERVER
|
||||
|
||||
exec curl "$@"
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
#!/bin/sh
|
||||
|
||||
newpath=$(echo ":$PATH:" | sed -e 's#:/usr/libexec/istore/mirror-bin:#:#g' -e 's/^:*//' -e 's/:*$//')
|
||||
[ -z "$newpath" ] && newpath="/usr/sbin:/usr/bin:/sbin:/bin"
|
||||
|
||||
export PATH="$newpath"
|
||||
|
||||
# if url starts with $IS_ORIG_SERVER, replace it with $IS_MIRROR_SERVER
|
||||
if [ -n "$IS_ORIG_SERVER" ] && [ -n "$IS_MIRROR_SERVER" ]; then
|
||||
for i in "$@"; do
|
||||
if [[ "$i" == "$IS_ORIG_SERVER"* ]]; then
|
||||
set -- "${@/$i/$IS_MIRROR_SERVER${i#$IS_ORIG_SERVER}}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
export -n IS_ORIG_SERVER IS_MIRROR_SERVER
|
||||
|
||||
exec wget "$@"
|
||||
@@ -10,13 +10,17 @@ include $(TOPDIR)/feeds/luci/luci.mk
|
||||
|
||||
install:
|
||||
[ -n "$(APP_STORE_VERSION)" ]
|
||||
mkdir -p "$(DESTDIR)/www/luci-static"
|
||||
mkdir -p "$(DESTDIR)/www/luci-static" "$(DESTDIR)/etc"
|
||||
cp -a "$(FRONTEND_DIST)/luci-static/istore" "$(DESTDIR)/www/luci-static/"
|
||||
$(SED) 's#\.js"#.js?v=$(APP_STORE_VERSION)"#g' "$(DESTDIR)/www/luci-static/istore/index.js"
|
||||
mkdir -p "$(DESTDIR)/etc/opkg/keys"
|
||||
echo "$(APP_STORE_VERSION)" > "$(DESTDIR)/etc/.app_store.version"
|
||||
cp -a ./compat.conf "$(DESTDIR)/etc/opkg/compatfeeds.conf"
|
||||
ifneq ($(USE_APK),)
|
||||
cp -pR ./root-apk/* "$(DESTDIR)/"
|
||||
else
|
||||
cp -pR ./root-opkg/* "$(DESTDIR)/"
|
||||
mkdir -p "$(DESTDIR)/etc/opkg/keys"
|
||||
cp -a ./key-build.pub $(DESTDIR)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign -F -p ./key-build.pub`
|
||||
endif
|
||||
mkdir -p "$(DESTDIR)$(LUCI_LIBRARYDIR)/i18n"
|
||||
$(foreach lang,$(LUCI_LANGUAGES),$(foreach po,$(wildcard ${CURDIR}/po/$(lang)/*.po), \
|
||||
po2lmo $(po) \
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
-----BEGIN PUBLIC KEY-----
|
||||
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEybK5eaXsrK06Thc1dbA3FC45Tlp8
|
||||
8X5Z831vU6JggiV6tJiwI/B05IsdklTaZE8SYh0XCHcnXSjzRMLtarBisg==
|
||||
-----END PUBLIC KEY-----
|
||||
@@ -0,0 +1 @@
|
||||
https://istore.istoreos.com/repo-apk/all/compat/packages.adb
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
Reference in new issue
Block a user