From 074289f7d7196ff22d86bc2fd3ccdf8bee5597e5 Mon Sep 17 00:00:00 2001
From: Teemu Matilainen <teemu.matilainen@iki.fi>
Date: Wed, 25 Nov 2020 23:26:47 +0200
Subject: [PATCH] Add "__chtf_" prefix to the "terraform-install.sh" script

Make it clear that it is bundled with chtf. Especially for autoladed
fish version.
---
 Makefile                                                   | 2 +-
 chtf/{terraform-install.sh => __chtf_terraform-install.sh} | 0
 chtf/chtf.fish                                             | 2 +-
 chtf/chtf.sh                                               | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename chtf/{terraform-install.sh => __chtf_terraform-install.sh} (100%)

diff --git a/Makefile b/Makefile
index 0ca4204..a8bee5e 100644
--- 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 b/chtf/__chtf_terraform-install.sh
similarity index 100%
rename from chtf/terraform-install.sh
rename to chtf/__chtf_terraform-install.sh
diff --git a/chtf/chtf.fish b/chtf/chtf.fish
index 8f22d18..1eeeb54 100644
--- 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
index a8c5430..690d179 100644
--- 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() {