|
@@ -125,7 +125,7 @@ shellfu() {
|
125
|
125
|
# Import module named $2
|
126
|
126
|
#
|
127
|
127
|
local mname=$2
|
128
|
|
- shellfu is_imported "$mname" && return 0
|
|
128
|
+ shellfu _is_imported "$mname" && return 0
|
129
|
129
|
if shellfu _do_import "$mname";
|
130
|
130
|
then
|
131
|
131
|
SHELLFU_IMPORTED="$SHELLFU_IMPORTED${SHELLFU_IMPORTED:+:}$mname"
|
|
@@ -140,13 +140,6 @@ shellfu() {
|
140
|
140
|
local mname=$2
|
141
|
141
|
( shellfu _do_import "$mname" )
|
142
|
142
|
;;
|
143
|
|
- is_imported)
|
144
|
|
- #
|
145
|
|
- # True if module $2 is already imported
|
146
|
|
- #
|
147
|
|
- local mname=$2
|
148
|
|
- echo "$SHELLFU_IMPORTED" | tr : \\n | grep -qx "$mname"
|
149
|
|
- ;;
|
150
|
143
|
|
151
|
144
|
_do_import)
|
152
|
145
|
#
|
|
@@ -176,6 +169,13 @@ shellfu() {
|
176
|
169
|
fi
|
177
|
170
|
return $es
|
178
|
171
|
;;
|
|
172
|
+ _is_imported)
|
|
173
|
+ #
|
|
174
|
+ # True if module $2 is already imported
|
|
175
|
+ #
|
|
176
|
+ local mname=$2
|
|
177
|
+ echo "$SHELLFU_IMPORTED" | tr : \\n | grep -qx "$mname"
|
|
178
|
+ ;;
|
179
|
179
|
|
180
|
180
|
_list_mfiles)
|
181
|
181
|
#
|