summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/bin/db-list-nonfree.py (renamed from extra/xbs-lukeshu/db-list-nonfree.py)0
-rw-r--r--src/bin/xbs16
2 files changed, 9 insertions, 7 deletions
diff --git a/extra/xbs-lukeshu/db-list-nonfree.py b/src/bin/db-list-nonfree.py
index a486fa5..a486fa5 100755
--- a/extra/xbs-lukeshu/db-list-nonfree.py
+++ b/src/bin/db-list-nonfree.py
diff --git a/src/bin/xbs b/src/bin/xbs
index 862ddab..77a7825 100644
--- a/src/bin/xbs
+++ b/src/bin/xbs
@@ -230,10 +230,6 @@ CONFIG_DIR="$(dirname "$(readlink -e "$0")")/etc"
source "${CONFIG_DIR}/xbs.cfg"
source "${SHARE_DIR}/xbs-functions"
-if [ "${#}" -eq '0' ]; then
- msg "usage: %s {add,init,rm,sync} <value> ..." "${0##*/}"
-fi
-
rules=${1}
case "${rules}" in
@@ -263,11 +259,13 @@ case "${rules}" in
fi
done
;;
- check-libraries|check-libs|chl|list-unsigned-packages|list-unsigd-pkgs|lup)
+ check-libraries|check-libs|chl|list-nonfree|list-nonlibre|lnf|lnl|list-unsigned-packages|list-unsigd-pkgs|lup)
if [ "${rules}" == 'check-libraries' || "${rules}" == 'check-libs' || "${rules}" == 'chl' ]; then
- "${BIN_DIR}/db-check-package-libraries.py ${@}"
+ "${BIN_DIR}/db-check-package-libraries.py ${@:2}"
+ elif [ "${rules}" == 'list-nonfree' || "${rules}" == 'list-nonlibre' || "${rules}" == 'lnf' || "${rules}" == 'lnl' ]; then
+ "${BIN_DIR}/db-list-nonfree.py ${@:2}"
elif [ "${rules}" == 'list-unsigned-packages' || "${rules}" == 'list-unsigd-pkgs' || "${rules}" == 'lup' ]; then
- "${BIN_DIR}/db-list-unsigned-packages.py ${@}"
+ "${BIN_DIR}/db-list-unsigned-packages.py ${@:2}"
fi
;;
init|sync|import)
@@ -305,4 +303,8 @@ case "${rules}" in
done
fi
;;
+ *)
+ # XBS Usage
+ msg "usage: %s <add || rm || check-libs || list-nonfree || list-unsigd-pkgs || init || sync> <value> ..." "${0##*/}"
+ ;;
esac