Add "__chtf_" prefix to the "terraform-install.sh" script

Make it clear that it is bundled with chtf. Especially for autoladed fish version.
Yleisradio · Nov 25, 2020 · 074289f · 074289f
1 parent 2e9e36c
commit 074289f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ else
 endif
 
 CHTF_FILES := chtf.sh chtf.fish VERSION
-CHTF_BIN_FILES := terraform-install.sh
+CHTF_BIN_FILES := __chtf_terraform-install.sh
 
 all:
 

diff --git a/chtf/terraform-install.sh → chtf/__chtf_terraform-install.sh b/chtf/terraform-install.sh → chtf/__chtf_terraform-install.sh
diff --git a/chtf/chtf.fish b/chtf/chtf.fish
@@ -133,7 +133,7 @@ end
 
 function _chtf_install_zip -a tf_version
     set -l tf_dir $CHTF_TERRAFORM_DIR/terraform-$tf_version
-    set -l installer (_chtf_root_dir)/terraform-install.sh
+    set -l installer (_chtf_root_dir)/__chtf_terraform-install.sh
 
     mkdir -p $tf_dir
     env TF_INSTALL_DIR=$tf_dir $installer -i $tf_version

diff --git a/chtf/chtf.sh b/chtf/chtf.sh
@@ -153,7 +153,7 @@ _chtf_install_zip() {
     local tf_dir="$CHTF_TERRAFORM_DIR/terraform-$tf_version"
 
     mkdir -p "$tf_dir"
-    env TF_INSTALL_DIR="$tf_dir" "$(_chtf_root_dir)"/terraform-install.sh -i "$tf_version"
+    env TF_INSTALL_DIR="$tf_dir" "$(_chtf_root_dir)"/__chtf_terraform-install.sh -i "$tf_version"
 }
 
 _chtf_confirm() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ else @@
     endif
     CHTF_FILES := chtf.sh chtf.fish VERSION
-    CHTF_BIN_FILES := terraform-install.sh
+    CHTF_BIN_FILES := __chtf_terraform-install.sh
     all:
@@ Expand Down @@