1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
|
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
|