update

gdbtek · Jan 18, 2019 · c2612b0 · c2612b0
1 parent c1c192e
commit c2612b0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 22 deletions.
diff --git a/cookbooks/java/recipes/pre-install.bash b/cookbooks/java/recipes/pre-install.bash
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+function main()
+{
+    source "$(dirname "${BASH_SOURCE[0]}")/../../../libraries/util.bash"
+
+    checkRequireMacSystem
+    checkRequireRootUser
+
+    rm -f -r '/Library/Java/JavaVirtualMachines'/openjdk-*.jdk
+}
+
+main "${@}"
diff --git a/tools/install-brew-applications.bash b/tools/install-brew-applications.bash
@@ -38,41 +38,54 @@ function installDependencies()
     fi
 }
 
-function install()
+function installBrewPackage()
 {
-    local -r caskPackageNames=($(sortUniqArray "${1}"))
-    local -r packageNames=($(sortUniqArray "${2}"))
+    local -r packageType=("${1}")
+    local -r packageNames=($(sortUniqArray "${@:2}"))
 
-    # Update Brew
+    local packageName=''
 
-    header 'UPDATING BREW'
+    for packageName in "${packageNames[@]}"
+    do
+        header "INSTALLING PACKAGE $(tr '[:lower:]' '[:upper:]' <<< "${packageName}")"
 
-    brew update
-    initializeFolder "$(getCurrentUserHomeFolder)/Library/Caches/Homebrew"
+        # Pre Install
 
-    # Cask Packages
+        if [[ -f "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/pre-install.bash" ]]
+        then
+            "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/pre-install.bash"
+        fi
 
-    local caskPackageName=''
+        # Install
 
-    for caskPackageName in "${caskPackageNames[@]}"
-    do
-        header "INSTALLING CASK PACKAGE $(tr '[:lower:]' '[:upper:]' <<< "${caskPackageName}")"
+        brew "${packageType[@]}" reinstall "${packageName}"
+        displayVersion "$(brew list --versions "${packageName}")"
 
-        brew cask reinstall "${caskPackageName}"
-        displayVersion "$(brew list --versions "${caskPackageName}")"
+        # Post Install
+
+        if [[ -f "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/post-install.bash" ]]
+        then
+            "${APP_FOLDER_PATH}/../cookbooks/${packageName}/recipes/post-install.bash"
+        fi
     done
+}
 
-    # Packages
+function install()
+{
+    local -r caskPackageNames="${1}"
+    local -r packageNames="${2}"
 
-    local packageName=''
+    # Update Brew
 
-    for packageName in "${packageNames[@]}"
-    do
-        header "INSTALLING PACKAGE $(tr '[:lower:]' '[:upper:]' <<< "${packageName}")"
+    header 'UPDATING BREW'
 
-        brew reinstall "${packageName}"
-        displayVersion "$(brew list --versions "${packageName}")"
-    done
+    brew update
+    initializeFolder "$(getCurrentUserHomeFolder)/Library/Caches/Homebrew"
+
+    # Install Packages
+
+    installBrewPackage 'cask' "${caskPackageNames}"
+    installBrewPackage '' "${packageNames}"
 
     # Clean Up