bug fixes

gdbtek · Nov 12, 2020 · 81c9e2c · 81c9e2c
1 parent a1a4d7d
commit 81c9e2c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 29 deletions.
diff --git a/cookbooks/java/recipes/post-install.bash b/cookbooks/java/recipes/post-install.bash
@@ -7,17 +7,11 @@ function main()
     checkRequireMacSystem
     checkRequireRootUser
 
-    local -r openJDKRootFolderPath="$(ls -1 -d -t '/Library/Java/JavaVirtualMachines/'openjdk-*.jdk | head -1)"
+    local -r openJDKHomeFolderPath='/usr/local/opt/openjdk/libexec/openjdk.jdk/Contents/Home'
 
-    checkExistFolder "${openJDKRootFolderPath}/Contents/Home"
+    checkExistFolder "${openJDKHomeFolderPath}"
 
-    # Allow Non Identified Developer
-
-    xattr -d -r 'com.apple.quarantine' "${openJDKRootFolderPath}"
-
-    # Add Dynamic Search For JAVA_HOME
-
-    local -r javaHomeConfig="export JAVA_HOME=\"\$(ls -1 -d -t '/Library/Java/JavaVirtualMachines/'openjdk-*.jdk | head -1)/Contents/Home\""
+    local -r javaHomeConfig="export JAVA_HOME='${openJDKHomeFolderPath}'"
 
     appendToFileIfNotFound \
         '/etc/profile' \

diff --git a/cookbooks/java/recipes/pre-install.bash b/cookbooks/java/recipes/pre-install.bash
diff --git a/roles/nam/roles/mac-cli-apps.bash b/roles/nam/roles/mac-cli-apps.bash
@@ -6,9 +6,6 @@ function main()
 
     local -r caskPackageNames=(
         'chef/chef/chefdk'
-        'google-cloud-sdk'
-        'java'
-        'vagrant'
     )
 
     local -r packageNames=(
@@ -43,6 +40,7 @@ function main()
         'nmap'
         'node'
         'nomad'
+        'openjdk'
         'packer'
         'python3'
         'redis'

diff --git a/tools/install-brew-applications.bash b/tools/install-brew-applications.bash
@@ -73,11 +73,11 @@ function installBrewPackage()
             header "INSTALLING CASK PACKAGE ${packageNameForHeader}"
 
             brew reinstall --force "${packageName}"
-            displayVersion "$(brew list --"${packageType}" --version "${packageName}")" "${packageNameForHeader}"
+            displayVersion "$(brew list --version "${packageName}" --"${packageType}")" "${packageNameForHeader}"
         else
             header "INSTALLING BREW PACKAGE ${packageNameForHeader}"
 
-            brew reinstall "${packageName}"
+            brew reinstall --force "${packageName}"
             displayVersion "$(brew list --version "${packageName}")" "${packageNameForHeader}"
         fi
 

diff --git a/tools/update-software.bash b/tools/update-software.bash
@@ -15,7 +15,7 @@ function main()
     softwareupdate --list
 
     header 'UPDATING SOFTWARE'
-    softwareupdate --all --install --force
+    softwareupdate --all --force --install
 }
 
 main "${@}"