From 7e9e824defa89170253e1ea7a5b043e98e280354 Mon Sep 17 00:00:00 2001 From: Christian Baer Date: Sun, 27 Sep 2020 08:26:23 +0200 Subject: [PATCH] Cleaned up Brewfile and fixed a bug in mac.sh --- init/Brewfile | 11 +++++------ init/mac.sh | 4 ++++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/init/Brewfile b/init/Brewfile index 3eb8c75..51aa392 100644 --- a/init/Brewfile +++ b/init/Brewfile @@ -31,7 +31,7 @@ brew "gotop" brew "htop" brew "hugo" brew "iperf" -brew "iperf3" +#brew "iperf3" brew "ipmitool" brew "jq" brew "koekeishiya/formulae/skhd" @@ -73,7 +73,7 @@ cask "diskmaker-x" cask "drawio" cask "evolv-escribe-suite" cask "fantastical" -cask "filebot" +#cask "filebot" cask "firefox" cask "fluid" cask "fog" @@ -108,12 +108,12 @@ cask "shifty" cask "sloth" cask "sonos" cask "spotify" -cask "stats" +#cask "stats" cask "thunderbird" cask "transmission" cask "transmit" cask "tunnelblick" -cask "tuxera-ntfs" +#cask "tuxera-ntfs" cask "typora" cask "virtualbox" cask "virtualbox-extension-pack" @@ -148,6 +148,5 @@ mas "ShutterCount", id: 720123827 mas "The Unarchiver", id: 425424353 mas "Todoist", id: 585829637 mas "Tweetbot", id: 557168941 -mas "VPN Monitor", id: 887410814 mas "WhatsApp", id: 1147396723 -mas "Xcode", id: 497799835 +#mas "Xcode", id: 497799835 diff --git a/init/mac.sh b/init/mac.sh index b8e2579..91c6c9f 100755 --- a/init/mac.sh +++ b/init/mac.sh @@ -219,6 +219,10 @@ done find $MAC_DOWNLOAD -name "*.dmg" -print0 | while IFS= read -r -d '' f; do echo ">>> Processing ${f}" hdiutil attach $f -quiet -mountpoint ${MAC_INSTALLMOUNT} + find ${MAC_INSTALLMOUNT} -name "*.pkg" -print0 | while IFS= read -r -d '' f; do + echo ">>> Processing ${f}" + sudo installer -pkg "$f" -target / + done cp -rf ${MAC_INSTALLMOUNT}/*.app /Applications hdiutil detach ${MAC_INSTALLMOUNT} -quiet done