summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/configuration.qdoc5
-rw-r--r--util/bash/README6
-rw-r--r--util/bash/appman-prompt22
3 files changed, 29 insertions, 4 deletions
diff --git a/doc/configuration.qdoc b/doc/configuration.qdoc
index 36b0e322..f0ae8bcb 100644
--- a/doc/configuration.qdoc
+++ b/doc/configuration.qdoc
@@ -167,6 +167,11 @@ all your imports paths and file references relative to your main config file.
milli-seconds. Values must be greater than or equal to 0, which is also the default value
(in this case registration will be done immediately after the event loop is executing).
\row
+ \li \b --start-session-dbus
+ \br \e -
+ \li bool
+ \li Start a private session bus instead of using an existing one.
+\row
\li \b --fullscreen
\br \e ui/fullscreen
\li bool
diff --git a/util/bash/README b/util/bash/README
index 1702f83b..cab1f365 100644
--- a/util/bash/README
+++ b/util/bash/README
@@ -1,7 +1,7 @@
Abstract
========
The appman-prompt script provides command completion inside a bash shell for
-the appman-controller and appman-packager commands.
+the appman executable, appman-controller and appman-packager commands.
Installation
============
@@ -17,8 +17,8 @@ Afterwards completion will be available in new shells.
Notes
=====
-(Sub-)Command options are currently not supported, only the general ones (help
-and version).
+(Sub-)Command options for the appman-controller and appman-packager are
+currently not supported, only the general ones (help and version).
Users of the zsh shell might want to run the following commands to get going:
autoload bashcompinit
diff --git a/util/bash/appman-prompt b/util/bash/appman-prompt
index 554bef90..5bdedd1a 100644
--- a/util/bash/appman-prompt
+++ b/util/bash/appman-prompt
@@ -26,12 +26,32 @@
##
#############################################################################
+_appman()
+{
+ local cur opts
+ COMPREPLY=()
+ cur="${COMP_WORDS[COMP_CWORD]}"
+ opts="--app-image-mount-dir --build-config --builtin-apps-manifest-dir -c --clear-config-cache --config-file \
+--database --dbus --force-multi-process --force-single-process --fullscreen --help -I \
+--installed-apps-manifest-dir --load-dummydata --logging-rule --no-config-cache --no-dlt-logging \
+--no-fullscreen --no-security --no-ui-watchdog -o --option --qml-debug --recreate-database -r --single-app \
+--slow-animations --start-session-dbus --verbose --version --wayland-socket-name"
+
+ if [[ ${cur} == -* ]] ; then
+ COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+ else
+ COMPREPLY=( $( compgen -f -- ${cur}) )
+ fi
+}
+complete -o filenames -F _appman appman
+
_appman-controller()
{
local cur commands opts pos args
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-locations show-installation-location"
+ commands="start-application debug-application stop-application stop-all-applications list-applications \
+show-application install-package remove-package list-installation-locations show-installation-location"
opts="-h -v --help --version"
if [ ${COMP_CWORD} -eq 1 ] && [[ ${cur} == -* ]] ; then