bug fixes

gdbtek · Jan 18, 2019 · 6fd69fa · 6fd69fa
1 parent d44766f
commit 6fd69fa
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 83 deletions.
diff --git a/bin/beautify-ascii-files.bash b/bin/beautify-ascii-files.bash
diff --git a/bin/tidy-ascii-files.bash b/bin/tidy-ascii-files.bash
diff --git a/bin/validate-bash.bash b/bin/validate-bash.bash
diff --git a/cookbooks/brew/recipes/install.bash b/cookbooks/brew/recipes/install.bash
@@ -18,9 +18,7 @@ function main()
 {
     local -r confirm="${1}"
 
-    local -r appFolderPath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-    source "${appFolderPath}/../../../libraries/util.bash"
+    source "$(dirname "${BASH_SOURCE[0]}")/../../../libraries/util.bash"
 
     checkRequireMacSystem
     checkRequireNonRootUser

diff --git a/cookbooks/brew/recipes/reinstall.bash b/cookbooks/brew/recipes/reinstall.bash
@@ -4,15 +4,13 @@ function main()
 {
     local -r confirm="${1}"
 
-    local -r appFolderPath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-    source "${appFolderPath}/../../../libraries/util.bash"
+    source "$(dirname "${BASH_SOURCE[0]}")/../../../libraries/util.bash"
 
     checkRequireMacSystem
     checkRequireNonRootUser
 
-    sudo "${appFolderPath}/uninstall.bash" "${confirm}"
-    "${appFolderPath}/install.bash" "${confirm}"
+    sudo "$(dirname "${BASH_SOURCE[0]}")/uninstall.bash" "${confirm}"
+    "$(dirname "${BASH_SOURCE[0]}")/install.bash" "${confirm}"
 }
 
 main "${@}"
diff --git a/cookbooks/brew/recipes/uninstall.bash b/cookbooks/brew/recipes/uninstall.bash
@@ -31,9 +31,7 @@ function main()
 {
     local -r confirm="${1}"
 
-    local -r appFolderPath="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-    source "${appFolderPath}/../../../libraries/util.bash"
+    source "$(dirname "${BASH_SOURCE[0]}")/../../../libraries/util.bash"
 
     checkRequireMacSystem
     checkRequireRootUser

diff --git a/tools/install-brew-applications.bash b/tools/install-brew-applications.bash
@@ -34,7 +34,7 @@ function installDependencies()
 {
     if [[ "$(existCommand 'brew')" = 'false' ]]
     then
-        "${APP_FOLDER_PATH}/../cookbooks/brew/recipes/install.bash" 'true'
+        "$(dirname "${BASH_SOURCE[0]}")/../cookbooks/brew/recipes/install.bash" 'true'
     fi
 }
 
@@ -51,21 +51,21 @@ function installBrewPackage()
 
         # Pre Install
 
-        if [[ -f "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/pre-install.bash" ]]
+        if [[ -f "$(dirname "${BASH_SOURCE[0]}")/../cookbooks/${packageName}/recipes/pre-install.bash" ]]
         then
-            sudo "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/pre-install.bash"
+            sudo "$(dirname "${BASH_SOURCE[0]}")/../cookbooks/${packageName}/recipes/pre-install.bash"
         fi
 
         # Install
 
-        brew "${packageType[@]}" reinstall "${packageName}"
-        displayVersion "$(brew list --versions "${packageName}")"
+        brew ${packageType[@]} reinstall "${packageName}"
+        displayVersion "$(brew ${packageType[@]} list --versions "${packageName}")"
 
         # Post Install
 
-        if [[ -f "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/post-install.bash" ]]
+        if [[ -f "$(dirname "${BASH_SOURCE[0]}")/../cookbooks/${packageName}/recipes/post-install.bash" ]]
         then
-            sudo "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/post-install.bash"
+            sudo "$(dirname "${BASH_SOURCE[0]}")/../cookbooks/${packageName}/recipes/post-install.bash"
         fi
     done
 }
@@ -101,9 +101,7 @@ function install()
 
 function main()
 {
-    APP_FOLDER_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-    source "${APP_FOLDER_PATH}/../libraries/util.bash"
+    source "$(dirname "${BASH_SOURCE[0]}")/../libraries/util.bash"
 
     # Parsing Command Arguments