-- 2.37.1 ++++++ 0002-distrobox-handle-situations-with-weird-manpages-setu.patch ++++++ From d8f81bb5a6169b4efce137c3538afa770abb1fbb Mon Sep 17 00:00:00 2001 From: Dario Faggioli dfaggioli@suse.com Date: Thu, 28 Jul 2022 11:02:05 +0200 Subject: [PATCH 2/4] distrobox: handle situations with weird manpages setup So, assume you're distro strip manpages during packages install. That might mean the `man` command exists, but there isn't any entry for anything. In that case, the following happens: distrobox --help No manual entry for distrobox An error occurred Fix this by checking also the return value of the `man` invocation too, and show our own help if it failed. Signed-off-by: Dario Faggioli dfaggioli@suse.com (cherry picked from https://github.com/89luca89/distrobox/pull/365) Signed-off-by: Dario Faggioli dfaggioli@suse.com --- distrobox | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/distrobox b/distrobox index 5cbb6de..4e37031 100755 --- a/distrobox +++ b/distrobox @@ -19,8 +19,6 @@ # along with distrobox; if not, see http://www.gnu.org/licenses/. # POSIX -set -o errexit -set -o nounset trap '[ "$?" -ne 0 ] && printf "\nAn error occurred\n"' EXIT @@ -50,6 +48,19 @@ if [ $# -eq 0 ]; then exit fi +# Handle 'help' here, before setting 'errexit', so we have a chance +# to show our help if the man command is there but fails. +if [ "$1" = "help" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then + if command -v man > /dev/null; then + man distrobox && exit 0 + fi + show_help + exit 0 +fi + +set -o errexit +set -o nounset + distrobox_path="$(dirname "${0}")" distrobox_command="${1}" shift @@ -76,14 +87,6 @@ case "${distrobox_command}" in printf "distrobox: %s\n" "${version}" exit 0 ;; - help | --help | -h) - if command -v man > /dev/null; then - man distrobox - exit 0 - fi - show_help - exit 0 - ;; *) # Default case: If no more options then break out of the loop. printf >&2 "Error: invalid command\n" show_help -- 2.37.1 ++++++ 0003-distrobox-if-no-command-is-specified-default-to-ente.patch ++++++ From 0f1a928d310ea35465f892ff0bda563d110a4ce7 Mon Sep 17 00:00:00 2001 From: Dario Faggioli dfaggioli@suse.com Date: Thu, 28 Jul 2022 10:10:28 +0200 Subject: [PATCH 3/4] distrobox: if no command is specified, default to enter If just `distrobox` is invoked, without any command, assume `distrobox enter`. Signed-off-by: Dario Faggioli dfaggioli@suse.com --- distrobox | 19 ++++++++++++------- docs/README.md | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/distrobox b/distrobox index 4e37031..ce0469c 100755 --- a/distrobox +++ b/distrobox @@ -19,6 +19,11 @@ # along with distrobox; if not, see http://www.gnu.org/licenses/. # POSIX +# Optional env variables: +# DBX_DEFAULT_COMMAND + +default_command="enter" +[ -n "${DBX_DEFAULT_COMMAND}" ] && default_command="${DBX_DEFAULT_COMMAND}" trap '[ "$?" -ne 0 ] && printf "\nAn error occurred\n"' EXIT @@ -43,11 +48,6 @@ Choose one of the available commands: EOF } -if [ $# -eq 0 ]; then - show_help - exit -fi - # Handle 'help' here, before setting 'errexit', so we have a chance # to show our help if the man command is there but fails. if [ "$1" = "help" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then @@ -62,8 +62,13 @@ set -o errexit set -o nounset distrobox_path="$(dirname "${0}")" -distrobox_command="${1}" -shift +if [ $# -eq 0 ]; then + printf "No command specified. Assuming: distrobox-%s\n" "${default_command}" + distrobox_command="${default_command}" +else + distrobox_command="${1}" + shift +fi # Simple wrapper to the distrobox utilities. # We just detect the 1st argument and launch the matching distrobox utility. diff --git a/docs/README.md b/docs/README.md index df00785..64e4c0d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -268,6 +268,7 @@ Alternatively it is possible to specify preferences using ENV variables: - DBX_CONTAINER_NAME - DBX_NON_INTERACTIVE - DBX_SKIP_WORKDIR +- DBX_DEFAULT_COMMAND --- -- 2.37.1 ++++++ 0004-opensuse-check-for-the-config-file-in-usr-etc-too.patch ++++++ From 9a9a4dd4843199e9e40668dc58986abb82fb9020 Mon Sep 17 00:00:00 2001 From: Dario Faggioli dfaggioli@suse.com Date: Wed, 27 Jul 2022 12:50:16 +0200 Subject: [PATCH 4/4] opensuse: check for the config file in /usr/etc too Signed-off-by: Dario Faggioli dfaggioli@suse.com --- distrobox-create | 1 + distrobox-enter | 1 + distrobox-list | 1 + distrobox-rm | 1 + distrobox-stop | 1 + docs/README.md | 1 + 6 files changed, 6 insertions(+) diff --git a/distrobox-create b/distrobox-create index b0bb0e9..94fe003 100755 --- a/distrobox-create +++ b/distrobox-create @@ -79,6 +79,7 @@ version="1.3.1" # leave priority to environment variables. config_files=" /usr/share/distrobox/distrobox.conf + /usr/etc/distrobox/distrobox.conf /etc/distrobox/distrobox.conf ${HOME}/.config/distrobox/distrobox.conf ${HOME}/.distroboxrc diff --git a/distrobox-enter b/distrobox-enter index e754c6b..25870f2 100755 --- a/distrobox-enter +++ b/distrobox-enter @@ -69,6 +69,7 @@ version="1.3.1" # leave priority to environment variables. config_files=" /usr/share/distrobox/distrobox.conf + /usr/etc/distrobox/distrobox.conf /etc/distrobox/distrobox.conf ${HOME}/.config/distrobox/distrobox.conf ${HOME}/.distroboxrc diff --git a/distrobox-list b/distrobox-list index f62da97..36788df 100755 --- a/distrobox-list +++ b/distrobox-list @@ -42,6 +42,7 @@ container_manager="autodetect" # leave priority to environment variables. config_files=" /usr/share/distrobox/distrobox.conf + /usr/etc/distrobox/distrobox.conf /etc/distrobox/distrobox.conf ${HOME}/.config/distrobox/distrobox.conf ${HOME}/.distroboxrc diff --git a/distrobox-rm b/distrobox-rm index 4d6b0a8..e23a1d7 100755 --- a/distrobox-rm +++ b/distrobox-rm @@ -46,6 +46,7 @@ version="1.3.1" # leave priority to environment variables. config_files=" /usr/share/distrobox/distrobox.conf + /usr/etc/distrobox/distrobox.conf /etc/distrobox/distrobox.conf ${HOME}/.config/distrobox/distrobox.conf ${HOME}/.distroboxrc diff --git a/distrobox-stop b/distrobox-stop index accfce0..f848b7e 100755 --- a/distrobox-stop +++ b/distrobox-stop @@ -45,6 +45,7 @@ version="1.3.1" # leave priority to environment variables. config_files=" /usr/share/distrobox/distrobox.conf + /usr/etc/distrobox/distrobox.conf /etc/distrobox/distrobox.conf ${HOME}/.config/distrobox/distrobox.conf ${HOME}/.distroboxrc diff --git a/docs/README.md b/docs/README.md index 64e4c0d..58cf1d8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -243,6 +243,7 @@ Configuration files can be placed in the following paths, from the least importa to the most important: - /usr/share/distrobox/distrobox.conf +- /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -- 2.37.1 ++++++ distrobox.conf ++++++ --- /var/tmp/diff_new_pack.9Vwi71/_old 2022-07-29 16:47:42.450620792 +0200 +++ /var/tmp/diff_new_pack.9Vwi71/_new 2022-07-29 16:47:42.454620804 +0200 @@ -1,4 +1,5 @@ container_image="registry.opensuse.org/opensuse/tumbleweed:latest" container_name="tumbleweed" container_manager="autodetect" +non_interactive="true"