IntenseWebs/distrobox
3
0
Fork 0
mirror of https://github.com/89luca89/distrobox.git synced 2026-08-19 01:14:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

create/enter: print error messages only when not in dry-run

Browse Source
This commit is contained in:
89luca89
2022-04-04 22:23:35 +02:00
parent 8a8288b963
commit e6f41a3fd3
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distrobox-create
+6 -6
View File
@@ -290,13 +290,13 @@ esac
# Be sure we have a container manager to work with. # Be sure we have a container manager to work with.
if ! command -v "${container_manager}" > /dev/null; then if ! command -v "${container_manager}" > /dev/null; then
# Error: we need at least one between docker or podman. # Error: we need at least one between docker or podman.
printf >&2 "Missing dependency: we need a container manager.\n"
printf >&2 "Please install one of podman or docker.\n"
printf >&2 "You can follow the documentation on:\n"
printf >&2 "\tman distrobox-compatibility\n"
printf >&2 "or:\n"
printf >&2 "\thttps://github.com/89luca89/distrobox/blob/main/docs/compatibility.md\n"
if [ "${dryrun}" -eq 0 ]; then if [ "${dryrun}" -eq 0 ]; then
printf >&2 "Missing dependency: we need a container manager.\n"
printf >&2 "Please install one of podman or docker.\n"
printf >&2 "You can follow the documentation on:\n"
printf >&2 "\tman distrobox-compatibility\n"
printf >&2 "or:\n"
printf >&2 "\thttps://github.com/89luca89/distrobox/blob/main/docs/compatibility.md\n"
exit 127 exit 127
fi fi
fi fi
distrobox-enter
+7 -7
View File
@@ -196,13 +196,13 @@ esac
# Be sure we have a container manager to work with. # Be sure we have a container manager to work with.
if ! command -v "${container_manager}" > /dev/null; then if ! command -v "${container_manager}" > /dev/null; then
# Error: we need at least one between docker or podman. # Error: we need at least one between docker or podman.
printf >&2 "Missing dependency: we need a container manager.\n"
printf >&2 "Please install one of podman or docker.\n"
printf >&2 "You can follow the documentation on:\n"
printf >&2 "\tman distrobox-compatibility\n"
printf >&2 "or:\n"
printf >&2 "\thttps://github.com/89luca89/distrobox/blob/main/docs/compatibility.md\n"
if [ "${dryrun}" -eq 0 ]; then if [ "${dryrun}" -eq 0 ]; then
printf >&2 "Missing dependency: we need a container manager.\n"
printf >&2 "Please install one of podman or docker.\n"
printf >&2 "You can follow the documentation on:\n"
printf >&2 "\tman distrobox-compatibility\n"
printf >&2 "or:\n"
printf >&2 "\thttps://github.com/89luca89/distrobox/blob/main/docs/compatibility.md\n"
exit 127 exit 127
fi fi
fi fi
@@ -276,7 +276,7 @@ generate_command() {
done done
# Start with the $PATH set in the container's config # Start with the $PATH set in the container's config
container_paths="${container_PATH}" container_paths="${container_PATH:-""}"
# Ensure the standard FHS program paths are in PATH environment # Ensure the standard FHS program paths are in PATH environment
standard_paths="/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin" standard_paths="/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin"
# add to the PATH after the existing paths, and only if not already present # add to the PATH after the existing paths, and only if not already present