avoid wildcard

gdbtek · Aug 28, 2015 · 744d905 · 744d905
1 parent 95d3e6c
commit 744d905
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 28 deletions.
diff --git a/cookbooks/ec2-ami-tools/recipes/install.bash b/cookbooks/ec2-ami-tools/recipes/install.bash
@@ -32,11 +32,7 @@ function install()
 
     # Move Folder
 
-    local -r currentPath="$(pwd)"
-
-    cd "${unzipFolder}"
-    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${EC2_AMI_TOOLS_INSTALL_FOLDER}" \;
-    cd "${currentPath}"
+    moveFolderContent "${unzipFolder}" "${EC2_AMI_TOOLS_INSTALL_FOLDER}"
     symlinkLocalBin "${EC2_AMI_TOOLS_INSTALL_FOLDER}/bin"
     rm -f -r "${unzipFolder}"
 

diff --git a/cookbooks/ec2-api-tools/recipes/install.bash b/cookbooks/ec2-api-tools/recipes/install.bash
@@ -32,11 +32,7 @@ function install()
 
     # Move Folder
 
-    local -r currentPath="$(pwd)"
-
-    cd "${unzipFolder}"
-    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${EC2_API_TOOLS_INSTALL_FOLDER}" \;
-    cd "${currentPath}"
+    moveFolderContent "${unzipFolder}" "${EC2_API_TOOLS_INSTALL_FOLDER}"
     rm -f -r "${unzipFolder}"
 
     # Config Profile

diff --git a/cookbooks/go-cd/recipes/install-agent.bash b/cookbooks/go-cd/recipes/install-agent.bash
@@ -34,11 +34,7 @@ function install()
 
     # Move Folder
 
-    local -r currentPath="$(pwd)"
-
-    cd "${unzipFolder}"
-    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${GO_CD_AGENT_INSTALL_FOLDER}" \;
-    cd "${currentPath}"
+    moveFolderContent "${unzipFolder}" "${GO_CD_AGENT_INSTALL_FOLDER}"
 
     # Finalize
 

diff --git a/cookbooks/go-cd/recipes/install-server.bash b/cookbooks/go-cd/recipes/install-server.bash
@@ -32,11 +32,7 @@ function install()
 
     # Move Folder
 
-    local -r currentPath="$(pwd)"
-
-    cd "${unzipFolder}"
-    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${GO_CD_SERVER_INSTALL_FOLDER}" \;
-    cd "${currentPath}"
+    moveFolderContent "${unzipFolder}" "${GO_CD_SERVER_INSTALL_FOLDER}"
 
     # Finalize
 

diff --git a/cookbooks/groovy/recipes/install.bash b/cookbooks/groovy/recipes/install.bash
@@ -32,11 +32,7 @@ function install()
 
     # Move Folder
 
-    local -r currentPath="$(pwd)"
-
-    cd "${unzipFolder}"
-    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${GROOVY_INSTALL_FOLDER}" \;
-    cd "${currentPath}"
+    moveFolderContent "${unzipFolder}" "${GROOVY_INSTALL_FOLDER}"
     rm -f -r "${unzipFolder}"
 
     # Config Lib

diff --git a/cookbooks/shell-check/recipes/install.bash b/cookbooks/shell-check/recipes/install.bash
@@ -7,18 +7,20 @@ function installDependencies()
 
 function install()
 {
+    local -r userHomeFolderPath="$(getCurrentUserHomeFolder)"
+
     # Clean Up
 
-    rm -f -r ~/.cabal ~/.ghc
+    rm -f -r "${userHomeFolderPath}/.cabal" "${userHomeFolderPath}/.ghc"
     initializeFolder "${CABAL_INSTALL_FOLDER}"
 
     # Install
 
     cabal update
     cabal install 'shellcheck'
 
-    mv ~/.cabal/* "${CABAL_INSTALL_FOLDER}"
-    rm -f -r ~/.cabal ~/.ghc
+    moveFolderContent "${userHomeFolderPath}/.cabal" "${CABAL_INSTALL_FOLDER}"
+    rm -f -r "${userHomeFolderPath}/.cabal" "${userHomeFolderPath}/.ghc"
     ln -f -s "${CABAL_INSTALL_FOLDER}/bin/shellcheck" '/usr/local/bin/shellcheck'
 
     # Config Profile

diff --git a/libraries/util.bash b/libraries/util.bash
@@ -169,6 +169,21 @@ function isValidJSONFile()
     isValidJSONContent "$(cat "${file}")"
 }
 
+function moveFolderContent()
+{
+    local -r sourceFolder="${1}"
+    local -r destinationFolder="${2}"
+
+    checkExistFolder "${sourceFolder}"
+    checkExistFolder "${destinationFolder}"
+
+    local -r currentPath="$(pwd)"
+
+    cd "${sourceFolder}"
+    find '.' -maxdepth 1 -not -name '.' -exec mv '{}' "${destinationFolder}" \;
+    cd "${currentPath}"
+}
+
 function symlinkLocalBin()
 {
     local -r sourceBinFolder="${1}"