1
1
# ! /usr/bin/env fish
2
2
3
+ set -g shared_logger_sh_loaded 0
4
+
3
5
set -q shared_module_loaded; or set -g shared_module_loaded 0
4
6
set -q shared_debug; or set -g shared_debug 0
5
7
set -q shared_install_location; or set -g shared_install_location " /opt/sascha-andres/shell"
6
8
7
9
set -g shared_loaded_modules
8
10
9
11
if test $shared_module_loaded -eq 0
10
- # set -u equivalent
11
-
12
- # shared_pipefail=${shared_pipefail:-1}
13
- # shared_exit_immediatly=${shared_exit_immediatly:-1}
14
-
15
- # if [ "x1" == "x${shared_debug}" ]; then
16
- # set -x
17
- # fi
18
- # if [ "x1" == "x${shared_exit_immediatly}" ]; then
19
- # set -e
20
- # fi
21
- # if [ "x1" == "x${shared_pipefail}" ]; then
22
- # set -o pipefail
23
- # fi
24
-
12
+ set -g shared_module_loaded 1
25
13
function pkg_module_loaded -d " list loaded modules"
26
14
if count $argv
27
- set value $argv
15
+ set -l value $argv
28
16
for mod in $shared_loaded_modules
29
17
if [ " $mod " = " $value " ]
30
18
return 0
@@ -35,13 +23,13 @@ if test $shared_module_loaded -eq 0
35
23
end
36
24
37
25
function pkg_import -d " import a module"
38
- pkg_module_loaded $argv > /dev/null
39
- if test $status -ne 0
26
+ set -l load_result ( pkg_module_loaded $argv )
27
+ if test $load_result -ne 0
40
28
if test -n $argv
41
29
if test -e " $shared_install_location /$argv .fish"
42
30
set -g shared_loaded_modules $shared_loaded_modules $argv
43
31
. " $shared_install_location /$argv .fish"
44
- return 0
32
+ return 0
45
33
else
46
34
echo " !! import of module '$argv ' failed !!"
47
35
end
@@ -51,5 +39,4 @@ if test $shared_module_loaded -eq 0
51
39
end
52
40
return 1
53
41
end
54
-
55
42
end
0 commit comments