From 489827ecb2d1de2da7b3f11b391475bf0fcba21b Mon Sep 17 00:00:00 2001 From: emmett1 Date: Sat, 2 Sep 2017 18:55:15 +0800 Subject: [PATCH] updated --- installpkg | 16 ++++++++++++++++ removepkg | 16 ++++++++++++++++ scratch | 20 ++++++++++++++++++-- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/installpkg b/installpkg index 6fbd0dd..6b0b174 100755 --- a/installpkg +++ b/installpkg @@ -403,6 +403,14 @@ parse_options() { *.spkg.txz) [ -f $1 ] && PKGNAME=$1 || msg "${color_red}$1${color_reset} not exist." ;; + --root) + if [ ! "$2" ]; then + msg "Option '$1' require an argument (root path)." + exit 1 + fi + ROOT="$2" + shift + ;; -h|--help) SHOW_HELP=yes ;; @@ -429,6 +437,14 @@ main() { loadconfigfile + # CHANGE ROOT PATH ### + if [ "$ROOT" ]; then + ROOT_DIR="$ROOT" + INDEX_DIR="$ROOT_DIR/$INDEX_DIR" + BACKUP_DIR="$ROOT_DIR/$BACKUP_DIR" + REJECTED_DIR="$ROOT_DIR/$REJECTED_DIR" + fi + ### SHOW HELP ### if [ "$SHOW_HELP" ]; then help diff --git a/removepkg b/removepkg index b1edcd9..6c1494a 100755 --- a/removepkg +++ b/removepkg @@ -243,6 +243,14 @@ parse_options() { --no-orphan-check) NO_ORPHAN_CHECK=yes ;; + --root) + if [ ! "$2" ]; then + msg "Option '$1' require an argument (root path)." + exit 1 + fi + ROOT="$2" + shift + ;; *) RMNAME=$1 ;; @@ -265,6 +273,14 @@ main() { loadconfigfile + # CHANGE ROOT PATH ### + if [ "$ROOT" ]; then + ROOT_DIR="$ROOT" + INDEX_DIR="$ROOT_DIR/$INDEX_DIR" + BACKUP_DIR="$ROOT_DIR/$BACKUP_DIR" + REJECTED_DIR="$ROOT_DIR/$REJECTED_DIR" + fi + if [ -z $RMNAME ]; then msgerr "Please state package name for remove." exit 1 diff --git a/scratch b/scratch index 92617fd..82f4de3 100755 --- a/scratch +++ b/scratch @@ -8,7 +8,7 @@ listinstalled() { for ip in ${installedpkg[@]}; do echo $ip done - msg "Total installed package: ${#installedpkg[@]}" + msg "Total installed package(s): ${#installedpkg[@]}" } getinstalledname() { @@ -49,7 +49,7 @@ listorphan() { for i in ${ORPHAN_PKG[@]}; do echo $i done - msg "Total orphan package: ${#ORPHAN_PKG[@]}" + msg "Total orphan package(s): ${#ORPHAN_PKG[@]}" } searchpkg() { @@ -525,6 +525,14 @@ parse_options() { OUTPUT_PKG="$2" shift ;; + --root) + if [ ! "$2" ]; then + msg "Option '$1' require an argument (root path)." + exit 1 + fi + ROOT="$2" + shift + ;; *) msg "Option invalid!" exit 1 @@ -548,6 +556,14 @@ main() { loadconfigfile + # CHANGE ROOT PATH ### + if [ "$ROOT" ]; then + ROOT_DIR="$ROOT" + INDEX_DIR="$ROOT_DIR/$INDEX_DIR" + BACKUP_DIR="$ROOT_DIR/$BACKUP_DIR" + REJECTED_DIR="$ROOT_DIR/$REJECTED_DIR" + fi + ### SHOW PORT PATH ### if [ $PORT_PATH ]; then showportpath