diff options
| author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2020-09-16 11:14:27 +0200 |
|---|---|---|
| committer | Bernd Weimer <bernd.weimer@pelagicore.com> | 2020-09-17 15:20:34 +0200 |
| commit | d9dbf6ba6473f61db503812c278ca50fb165d904 (patch) | |
| tree | d7ee7934f3e23f7d9faab570bb8ef0f690046c91 /util | |
| parent | d4277ed9597a2277f6a32f3f8480d746cd020a82 (diff) | |
| download | qtapplicationmanager-d9dbf6ba6473f61db503812c278ca50fb165d904.tar.gz | |
Correct tools command line options
Updated documentation and bash completion.
Change-Id: Ie87c60cadfb46866b5cbfe9e8fdf8a646d28aa94
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'util')
| -rw-r--r-- | util/bash/appman-prompt | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/util/bash/appman-prompt b/util/bash/appman-prompt index 5c4f3574..266706be 100644 --- a/util/bash/appman-prompt +++ b/util/bash/appman-prompt @@ -32,17 +32,16 @@ _appman() local cur opts COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" - opts="--app-image-mount-dir --build-config --builtin-apps-manifest-dir -c --clear-cache --config-file \ ---database --dbus --disable-installer --force-multi-process --force-single-process --fullscreen --help -I \ ---installed-apps-manifest-dir --load-dummydata --log-instant --logging-rule --no-cache --no-dlt-logging \ ---no-fullscreen --no-security --no-ui-watchdog -o --option --qml-debug --single-app \ ---slow-animations --verbose --version --wayland-socket-name" + opts="-c -h -o -v -I --build-config --builtin-apps-manifest-dir --clear-cache --clear-config-cache --config-file \ +--development-mode --dbus --disable-installer --disable-intents --document-dir --enable-touch-emulation \ +--force-multi-process --force-single-process --fullscreen --help --load-dummydata --log-instant --logging-rule \ +--no-cache --no-config-cache --no-dlt-logging --no-fullscreen --no-security --no-ui-watchdog --option --qml-debug \ +--single-app --slow-animations --verbose --version --wayland-socket-name" dbusopts="session system none" if [[ ${cur} == -* ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) else - COMPREPLY=( $(compgen -W "${dbusopts}" -- ${cur}) ) if [ ${COMP_CWORD} -gt 1 ] && [[ ${COMP_WORDS[COMP_CWORD-1]} == "--dbus" ]] ; then COMPREPLY=( $(compgen -W "${dbusopts}" -- ${cur}) ) else @@ -58,9 +57,9 @@ _appman-controller() COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" commands="start-application debug-application stop-application stop-all-applications list-applications \ -show-application install-package remove-package list-installation-tasks cancel-installation-task \ -list-installation-locations show-installation-location" - opts="-h -v --help --version" +show-application list-packages show-package install-package remove-package list-installation-tasks \ +cancel-installation-task list-installation-locations show-installation-location" + opts="-h -v --help --help-all --version" if [ ${COMP_CWORD} -eq 1 ] && [[ ${cur} == -* ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) @@ -75,7 +74,7 @@ list-installation-locations show-installation-location" COMPREPLY=( $(compgen -W "${commands}" -- ${cur}) ) elif [ ${pos} -eq 2 ]; then case "${args[0]}" in - start-application|debug-application|stop-application|show-application|remove-package) + start-application|debug-application|stop-application|show-application) eval cmd="${COMP_WORDS[0]}" apps="$(${cmd} list-applications 2> /dev/null)" COMPREPLY=( $(compgen -W "${apps}" -- ${cur}) ) @@ -93,6 +92,11 @@ list-installation-locations show-installation-location" apps="$(${cmd} list-applications 2> /dev/null)" COMPREPLY=( $(compgen -W "${apps}" -- ${cur}) ) ;; + show-package|remove-package) + eval cmd="${COMP_WORDS[0]}" + packages="$(${cmd} list-packages 2> /dev/null)" + COMPREPLY=( $(compgen -W "${packages}" -- ${cur}) ) + ;; esac fi fi @@ -104,8 +108,8 @@ _appman-packager() local cur commands opts pos args COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" - commands="create-package dev-sign-package dev-verify-package store-sign-package store-verify-package" - opts="-h -v --help --version" + commands="create-package dev-sign-package dev-verify-package store-sign-package store-verify-package yaml-to-json" + opts="-h -v --help --help-all --version" if [ ${COMP_CWORD} -eq 1 ] && [[ ${cur} == -* ]] ; then COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) ) @@ -127,7 +131,7 @@ _appman-packager() dev-sign-package|store-sign-package) [ ${pos} -lt 5 ] && file=1 ;; - dev-verify-package|store-verify-package) + dev-verify-package|store-verify-package|yaml-to-json) file=1 ;; esac |