- Add support for avoiding execution if the script is sourced

DannyBen · Dec 30, 2024 · 4d83222 · 4d83222
1 parent 2073e83
commit 4d83222
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/lib/bashly/libraries/settings/settings.yml b/lib/bashly/libraries/settings/settings.yml
@@ -110,6 +110,7 @@ enable_view_markers: development
 enable_inspect_args: development
 enable_deps_array: always
 enable_env_var_names_array: always
+enable_sourcing: development
 
 
 #-------------------------------------------------------------------------------

diff --git a/lib/bashly/settings.rb b/lib/bashly/settings.rb
@@ -13,6 +13,7 @@ class << self
         :enable_env_var_names_array,
         :enable_header_comment,
         :enable_inspect_args,
+        :enable_sourcing,
         :enable_view_markers,
         :lib_dir,
         :partials_extension,
@@ -48,28 +49,32 @@ def enabled?(feature)
           (send(:"enable_#{feature}") == 'development' && !production?)
       end
 
-      def enable_header_comment
-        @enable_header_comment ||= get :enable_header_comment
-      end
-
       def enable_bash3_bouncer
         @enable_bash3_bouncer ||= get :enable_bash3_bouncer
       end
 
-      def enable_view_markers
-        @enable_view_markers ||= get :enable_view_markers
+      def enable_deps_array
+        @enable_deps_array ||= get :enable_deps_array
+      end
+
+      def enable_env_var_names_array
+        @enable_env_var_names_array ||= get :enable_env_var_names_array
+      end
+
+      def enable_header_comment
+        @enable_header_comment ||= get :enable_header_comment
       end
 
       def enable_inspect_args
         @enable_inspect_args ||= get :enable_inspect_args
       end
 
-      def enable_deps_array
-        @enable_deps_array ||= get :enable_deps_array
+      def enable_sourcing
+        @enable_sourcing ||= get :enable_sourcing
       end
 
-      def enable_env_var_names_array
-        @enable_env_var_names_array ||= get :enable_env_var_names_array
+      def enable_view_markers
+        @enable_view_markers ||= get :enable_view_markers
       end
 
       def env

diff --git a/lib/bashly/views/command/master_script.gtx b/lib/bashly/views/command/master_script.gtx
@@ -13,6 +13,13 @@
 = render :run
 
 > 
-> initialize
-> run "$@"
-> 
+if Settings.enabled? :sourcing
+  > if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
+  >   initialize
+  >   run "$@"
+  > fi
+else
+  > initialize
+  > run "$@"
+end
+>