Skip to content

Commit 82e664f

Browse files
committed
AppRun help improvements
as -h/--help/--fullhelp is handled internally, print a hint how to invoke UltraGrid --help/--fullhelp more improvements: - explicitly mention that the usage is for AppImage - mention --appimage-* - as the list is actually list of exceptions that are not passed as arguments to uv, mention this explicitly (differently in help and fullhelp) - other related reformulations to clarify the stuff
1 parent 5a9c1ba commit 82e664f

File tree

1 file changed

+28
-8
lines changed
  • data/scripts/Linux-AppImage

1 file changed

+28
-8
lines changed

data/scripts/Linux-AppImage/AppRun

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,21 +76,33 @@ ${bold_str}...\n" "$(get_tools)" "$dstdir" "$abs_path"
7676
## @param $1 non-empty to show full help
7777
usage() {
7878
full=${1:+1}
79-
printf "usage:\n"
79+
printf "${bold}UltraGrid AppImage${reset} usage:\n"
8080
printf "\t${bold}${red}%s${reset} ${bold}[--gui [args]]${reset}\n" "$ARGV0"
8181
printf "\t\tinvokes GUI\n"
8282
printf "\n"
83-
printf "\t${bold}${red}%s${reset} ${bold}--appimage-help${reset}\n" "$ARGV0"
84-
printf "\t\tprints AppImage related options\n"
83+
if [ "$full" ]; then
84+
printf "\t${bold}${red}%s${reset} ${bold}--appimage-help\
85+
${reset}\n" "$ARGV0"
86+
printf "\t\tprints AppImage runtime related options\n"
87+
printf "\n"
88+
printf "\t${bold}${red}%s${reset} ${bold}--appimage-*\
89+
${reset}\n" "$ARGV0"
90+
printf "\t\toptions interpreted by AppImage runtime itself (see\
91+
the above option)\n"
92+
else
93+
printf "\t${bold}${red}%s${reset} ${bold}--appimage-*${reset}\n" "$ARGV0"
94+
printf "\t\tAppImage runtime options (see '--appimage-help')\n"
95+
fi
8596
printf "\n"
8697
printf "\t${bold}${red}%s${reset} ${bold}-h | --help | --fullhelp${reset}\n" "$ARGV0"
87-
printf "\t\tprints this help (extended version with ${bold}--fullhelp${reset})\n"
98+
printf "\t\tprints UG AppImage (this) help (extended version with\
99+
${bold}--fullhelp${reset})\n"
88100
printf "\n"
89101
printf "\t${bold}${red}%s${reset} ${bold}--ug-help${reset}\n" "$ARGV0"
90-
printf "\t\tprints UltraGrid help (as '-h' if it weren't run from AppImage)\n"
102+
printf "\t\tprints UltraGrid help (as 'uv -h' if it weren't run from AppImage)\n"
91103
printf "\n"
92104
printf "\t${bold}${red}%s${reset} ${bold}-m|--man [uv|hd-rum-transcode]${reset}\n" "$ARGV0"
93-
printf "\t\tprints manual page\n"
105+
printf "\t\tshow manual page\n"
94106
printf "\n"
95107
printf "\t${bold}${red}%s${reset} ${bold}-u|--update [args]${reset}\n" "$ARGV0"
96108
printf "\t\tupdates AppImage (args will be passed to appimageupdatetool)\n"
@@ -107,10 +119,18 @@ usage() {
107119
printf "\t\tmake symlinks for the above tools to allow direct run\n"
108120
printf "\n"
109121
fi
110-
printf "\t${bold}${red}%s${reset} ${bold}args${reset}\n" "$ARGV0"
111-
printf "\t\tinvokes command-line UltraGrid\n"
122+
printf "\t${bold}${red}%s${reset} ${bold}args...${reset}\n" "$ARGV0"
123+
printf "\t\tinvokes command-line UltraGrid (uv) with arguments forwarded (with the\n"
124+
printf "\t\texception of the options described above)\n"
112125
printf "\n"
113126

127+
if [ "$full" ]; then
128+
printf "Use '${bold}%s -H${reset}' to see full help for uv (alternatively\
129+
'-o uv --fullhelp').\n\n" "$ARGV0"
130+
else
131+
printf "Use ${bold}%s --ug-help${reset} to see uv help.\n\n" "$ARGV0"
132+
fi
133+
114134
if [ ! "$full" ]; then
115135
return
116136
fi

0 commit comments

Comments
 (0)