added remove command

1 files changed, 84 insertions, 2 deletions

diff --git a/src/xi.sh b/src/xi.sh
index e00e68d..1e240dd 100755
--- a/src/xi.sh
+++ b/src/xi.sh
@@ -1,5 +1,63 @@
 #!/bin/sh
 
+usage () {
+cat << "EOF"
+Usage: xi [options] command...
+
+Available Options:
+    -r [path]
+        specify the installation root [default: /]
+    -c [path]
+        specify the config file to use [default: /etc/xipkg.conf]
+    -q
+        supress unecessary outputs
+    -v
+        be more verbose
+    -n
+        do not resolve package dependenceies
+    -l
+        do not sync databases (ignored when explicitly running sync)
+    -u
+        do not validate against keychain
+    -y
+        skip prompts
+    -h 
+        show help and exists
+
+Available Commands:
+    sync
+        sync the local package database with the remote repositories
+
+    install [packages..]
+        install package(s) into the system
+    update
+        update all packages on the system
+    remove [packages...]
+        remove packages from the system
+    fetch [package]
+        download a .xipkg file
+    keyimport [name] [url]
+        import a key from a url
+
+    search [query]
+        search the database for a package
+    files [package]
+        list files belonging to a package
+    list
+        list available packagesa
+    list-installed
+        lists installed packages
+    file [path]
+        shows which package a file belongs to
+
+    bootstrap [additional packages...]
+        installs base packages and system files to an empty system
+
+    help
+        shows this message
+EOF
+}
+
 [ -z "${LIBDIR}" ] && LIBDIR=/usr/lib/xipkg
 
 export SYSROOT=/
@@ -11,7 +69,7 @@ export DO_SYNC=true
 export UNSAFE=false
 export NOCONFIRM=false
 
-while getopts ":r:c:qnluyv" opt; do
+while getopts ":r:c:qnluyvh" opt; do
     case "${opt}" in
         r)
             SYSROOT=$(realpath ${OPTARG})
@@ -37,6 +95,10 @@ while getopts ":r:c:qnluyv" opt; do
         q)
             QUIET=true
             ;;
+        h)
+            usage
+            exit 0
+            ;;
     esac
 done
 
@@ -48,6 +110,7 @@ done
 . ${LIBDIR}/sync.sh
 . ${LIBDIR}/install.sh
 . ${LIBDIR}/bootstrap.sh
+. ${LIBDIR}/remove.sh
 . ${LIBDIR}/get.sh
 
 shift $((OPTIND-1))
@@ -61,12 +124,22 @@ else
             ;;
         "install" | "update")
             shift
+            $DO_SYNC && sync
             install $@
             ;;
         "search")
             shift
             search $@
             ;;
+        "fetch")
+            shift
+            $DO_SYNC && sync
+            fetch $@
+            ;;
+        "remove")
+            shift
+            remove $@
+            ;;
         "files")
             shift
             files $@
@@ -76,14 +149,23 @@ else
             set -o noglob
             keyimport $@
             ;;
+        "list")
+            list
+            ;;
+        "list-installed")
+            list_installed
+            ;;
         "file")
             shift
-            file $@
+            file_info $@
             ;;
         "bootstrap")
             shift
             bootstrap $@
             ;;
+        "help")
+            usage
+            ;;
         *)
             $DO_SYNC && sync
             fetch $@