mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-07 14:23:19 +00:00
138 lines
4.6 KiB
Diff
138 lines
4.6 KiB
Diff
diff --git a/distrobox-create b/distrobox-create
|
|
index 64e9911..136659d 100755
|
|
--- a/distrobox-create
|
|
+++ b/distrobox-create
|
|
@@ -74,6 +74,10 @@ unshare_ipc=0
|
|
unshare_netns=0
|
|
unshare_process=0
|
|
unshare_devsys=0
|
|
+
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Use cd + dirname + pwd so that we do not have relative paths in mount points
|
|
# We're not using "realpath" here so that symlinks are not resolved this way
|
|
# "realpath" would break situations like Nix or similar symlink based package
|
|
@@ -98,6 +102,7 @@ version="1.6.0.1"
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-enter b/distrobox-enter
|
|
index 6d8998a..bb05437 100755
|
|
--- a/distrobox-enter
|
|
+++ b/distrobox-enter
|
|
@@ -75,10 +75,14 @@ skip_workdir=0
|
|
verbose=0
|
|
version="1.6.0.1"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-generate-entry b/distrobox-generate-entry
|
|
index 3243691..6a7910a 100755
|
|
--- a/distrobox-generate-entry
|
|
+++ b/distrobox-generate-entry
|
|
@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg"
|
|
verbose=0
|
|
version="1.6.0.1"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-list b/distrobox-list
|
|
index aaec85e..235e529 100755
|
|
--- a/distrobox-list
|
|
+++ b/distrobox-list
|
|
@@ -44,10 +44,14 @@ verbose=0
|
|
version="1.6.0.1"
|
|
container_manager="autodetect"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-rm b/distrobox-rm
|
|
index 702c1dd..2e37538 100755
|
|
--- a/distrobox-rm
|
|
+++ b/distrobox-rm
|
|
@@ -54,10 +54,14 @@ rm_home=0
|
|
response_rm_home="N"
|
|
version="1.6.0.1"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-stop b/distrobox-stop
|
|
index fd17cc1..e0dbc8f 100755
|
|
--- a/distrobox-stop
|
|
+++ b/distrobox-stop
|
|
@@ -52,10 +52,14 @@ non_interactive=0
|
|
verbose=0
|
|
version="1.6.0.1"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|
|
diff --git a/distrobox-upgrade b/distrobox-upgrade
|
|
index ab5e96f..dc8d295 100755
|
|
--- a/distrobox-upgrade
|
|
+++ b/distrobox-upgrade
|
|
@@ -39,10 +39,14 @@ rootful=0
|
|
verbose=0
|
|
version="1.6.0.1"
|
|
|
|
+self_dir="$(dirname "$(realpath "$0")")"
|
|
+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")"
|
|
+
|
|
# Source configuration files, this is done in an hierarchy so local files have
|
|
# priority over system defaults
|
|
# leave priority to environment variables.
|
|
config_files="
|
|
+ $nix_config_file
|
|
/usr/share/distrobox/distrobox.conf
|
|
/usr/share/defaults/distrobox/distrobox.conf
|
|
/usr/etc/distrobox/distrobox.conf
|