Merge branch 'master' of https://github.com/nikita-bykov/virtual-environments into pipx

images/macos/provision/core/audiodevice.sh

@@ -12,8 +12,3 @@ brew install sox
 echo "set Soundflower (2ch) as input/output device"
 SwitchAudioSource -s "Soundflower (2ch)" -t input
 SwitchAudioSource -s "Soundflower (2ch)" -t output
-
-echo "grant microphone permission for simulators"
-sudo sqlite3 ~/Library/Application\ Support/com.apple.TCC/TCC.db "insert into access values('kTCCServiceMicrophone','com.apple.CoreSimulator.SimulatorTrampoline', 0,1,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576347152)"
-sudo sqlite3 /Library/Application\ Support/com.apple.TCC/TCC.db "insert into access values('kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh', 1,1,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342)"
-sudo sqlite3 ~/Library/Application\ Support/com.apple.TCC/TCC.db "insert into access values('kTCCServiceMicrophone','/usr/local/opt/runner/runprovisioner.sh', 1,1,1,NULL,NULL,NULL,'UNUSED',NULL,NULL,1576661342)"

images/macos/provision/core/commonutils.sh

@@ -19,7 +19,7 @@ binst_common_utils=(
     helm
     aliyun-cli
     bazelisk
-    github/gh/gh
+    gh
     p7zip
     ant
     aria2

images/macos/provision/core/edge.sh

@@ -1,7 +1,11 @@
 source ~/utils/utils.sh
 
 echo "Installing Microsoft Edge..."
+# Workaround to install version 85 since webdriver is broken for 86
+cd "$(brew --repo homebrew/homebrew-cask)"
+git checkout 81f9d08d2b9b7557c0178621078cf59d2c5db2bc
 brew cask install microsoft-edge
+git checkout master
 
 EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
 EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)
@@ -39,7 +43,7 @@ AUTOUPDATE_START="$HOME/Library/Preferences/com.microsoft.autoupdate2.plist"
 while [ ! -f "$AUTOUPDATE_START" ]
 do
     echo "Wait for MS update automatic installation"
-    sleep 30    
+    sleep 30
 done
 
 echo "kill autoupdate process"

images/macos/provision/core/haskell.sh

@@ -4,7 +4,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
 export PATH="$HOME/.ghcup/bin:$PATH"
 echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc"
 
-availableVersions=$(ghcup list | grep -v "prerelease" | grep "ghc " | awk '{print $3}')
+# ghcup output looks like this "ghc 8.6.4 base-4.12.0.0 hls-powered", need to take all the first versions only(8.6.4 in that case) and avoid pre-release ones
+availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}')
+
+# Install 3 latest major versions(For instance 8.6.5, 8.8.4, 8.10.2)
 minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n3)
 for majorMinorVersion in $minorMajorVersions; do
     fullVersion=$(echo "$availableVersions" | grep "$majorMinorVersion." | tail -n1)

images/macos/provision/core/nvm.sh

@@ -6,7 +6,8 @@
 ###########################################################################
 source ~/utils/utils.sh
 
-curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.35.3/install.sh | bash
+VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name')
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash
 
 if [ $? -eq 0 ]; then
         . ~/.bashrc
@@ -23,13 +24,13 @@ if [ $? -eq 0 ]; then
         nvm alias node12 lts/erbium
         nvm alias node13 v13
         nvm alias node14 v14
-        
+
         if is_Catalina || is_BigSur; then
                 # set system node as default
                 nvm alias default system
         fi
 else
-        echo error 
+        echo error
 fi
 
 echo "Node version manager has been installed successfully"

images/macos/provision/core/openssl.sh

@@ -1,4 +1,7 @@
 #!/bin/sh
+
+source ~/utils/utils.sh
+
 echo "Installing OpenSSL..."
 export PATH="/usr/local/bin:/usr/local/sbin:~/bin:$PATH"
 

images/macos/provision/core/xcode-tools.sh

@@ -35,13 +35,7 @@ do
     echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..."
     extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL"
 
-    # Remove "beta" postfix from version
-    if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
-        # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
-        XCODE_VERSION="12_beta"
-    else
-        XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
-    fi
+    XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
 
     echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid"
     validateXcodeIntegrity "$WORK_DIR"
@@ -55,9 +49,7 @@ do
     # Creating a symlink for all Xcode 10* and Xcode 9.3, 9.4 to stay backwards compatible with consumers of the Xcode beta version
     createBetaSymlink $XCODE_VERSION
 
-    if [ ! $(echo $XCODE_VERSION | grep "beta") ]; then
-        createXamarinProvisionatorSymlink "$XCODE_VERSION"
-    fi
+    createXamarinProvisionatorSymlink "$XCODE_VERSION"
 
     find $WORK_DIR -mindepth 1 -delete
 done
@@ -74,12 +66,7 @@ do
         continue
     fi
 
-    if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then
-        # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side
-        XCODE_VERSION="12_beta"
-    else
-        XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
-    fi
+    XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1)
 
     echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..."
     runFirstLaunch $XCODE_VERSION