Skip to content

Commit 221f697

Browse files
committed
fix: reduct unwanted output
: hotfix/reduce-output
1 parent ac74272 commit 221f697

File tree

3 files changed

+11
-26
lines changed

3 files changed

+11
-26
lines changed

logger.fish

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#!/usr/bin/env fish
22

3-
set -q shared_logger_sh_loaded; or set -g shared_logger_sh_loaded 0
4-
53
if test 1 -eq $shared_logger_sh_loaded
64
# if [ "x1" == "x${shared_debug}" ]; then
75
echo "logger.sh already included"

module.fish

+7-20
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,18 @@
11
#! /usr/bin/env fish
22

3+
set -g shared_logger_sh_loaded 0
4+
35
set -q shared_module_loaded; or set -g shared_module_loaded 0
46
set -q shared_debug; or set -g shared_debug 0
57
set -q shared_install_location; or set -g shared_install_location "/opt/sascha-andres/shell"
68

79
set -g shared_loaded_modules
810

911
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
2513
function pkg_module_loaded -d "list loaded modules"
2614
if count $argv
27-
set value $argv
15+
set -l value $argv
2816
for mod in $shared_loaded_modules
2917
if [ "$mod" = "$value" ]
3018
return 0
@@ -35,13 +23,13 @@ if test $shared_module_loaded -eq 0
3523
end
3624

3725
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
4028
if test -n $argv
4129
if test -e "$shared_install_location/$argv.fish"
4230
set -g shared_loaded_modules $shared_loaded_modules $argv
4331
. "$shared_install_location/$argv.fish"
44-
return 0
32+
return 0
4533
else
4634
echo "!! import of module '$argv' failed !!"
4735
end
@@ -51,5 +39,4 @@ if test $shared_module_loaded -eq 0
5139
end
5240
return 1
5341
end
54-
5542
end

test.fish

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ end
1111

1212
source "$shared_install_location/module.fish"
1313

14-
pkg_module_loaded "logger"
14+
set -l is_loaded (pkg_module_loaded "logger")
1515

16-
if [ $status -eq 0 ]
16+
if [ $is_loaded -eq 0 ]
1717
echo "Logger is loaded: y"
1818
else
1919
echo "Logger is loaded: n"
@@ -25,8 +25,8 @@ pkg_import execute
2525

2626
logger_header "logger"
2727

28-
pkg_module_loaded "logger"
29-
if [ $status -eq 0 ]
28+
set -l is_loaded (pkg_module_loaded "logger")
29+
if [ $is_loaded -eq 0 ]
3030
logger_write "Logger is loaded: y"
3131
else
3232
logger_write "Logger is loaded: n"

0 commit comments

Comments
 (0)