Remove rosetta 2 compatible flag

sdkman · Oct 15, 2023 · b95e9e3 · b95e9e3
1 parent 3165cbe
commit b95e9e3
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 19 deletions.
diff --git a/app/views/includes/infer_platform.scala.txt b/app/views/includes/infer_platform.scala.txt
@@ -38,11 +38,7 @@ function infer_platform() {
 		echo "darwinx64"
 		;;
 	  arm64)
-		if [[ "$sdkman_rosetta2_compatible" == 'true' ]]; then
-			echo "darwinx64"
-		else
-			echo "darwinarm64"
-		fi
+		echo "darwinarm64"
 		;;
 	  *)
 	  	echo "darwinx64"

diff --git a/app/views/install_beta.scala.txt b/app/views/install_beta.scala.txt
@@ -82,7 +82,6 @@ echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file"
 echo "sdkman_curl_max_time=10" >> "$sdkman_config_file"
 echo "sdkman_debug_mode=false" >> "$sdkman_config_file"
 echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file"
-echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file"
 echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file"
 
 # script cli distribution
@@ -135,4 +134,4 @@ fi
 
 }
 
-@includes.install_message(beta)
+@includes.install_message(beta)
diff --git a/app/views/install_stable.scala.txt b/app/views/install_stable.scala.txt
@@ -82,7 +82,6 @@ echo "sdkman_curl_connect_timeout=7" >> "$sdkman_config_file"
 echo "sdkman_curl_max_time=10" >> "$sdkman_config_file"
 echo "sdkman_debug_mode=false" >> "$sdkman_config_file"
 echo "sdkman_insecure_ssl=false" >> "$sdkman_config_file"
-echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file"
 echo "sdkman_selfupdate_feature=true" >> "$sdkman_config_file"
 
 # script cli distribution
@@ -135,4 +134,4 @@ fi
 
 }
 
-@includes.install_message(beta)
+@includes.install_message(beta)
diff --git a/app/views/selfupdate_beta.scala.txt b/app/views/selfupdate_beta.scala.txt
@@ -107,10 +107,6 @@ if ! grep 'sdkman_auto_env' "${sdkman_config_file_tmp}"; then
 	echo "sdkman_auto_env=false" >> "$sdkman_config_file_tmp"
 fi
 
-if ! grep 'sdkman_rosetta2_compatible' "${sdkman_config_file_tmp}"; then
-	echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file_tmp"
-fi
-
 if ! grep 'sdkman_checksum_enable' "${sdkman_config_file_tmp}"; then
 	echo "sdkman_checksum_enable=true" >> "$sdkman_config_file_tmp"
 fi
@@ -157,4 +153,4 @@ echo "$SDKMAN_NATIVE_VERSION" > "${SDKMAN_DIR}/var/version_native"
 rm -rf "${SDKMAN_DIR}"/tmp
 mkdir "${SDKMAN_DIR}"/tmp
 
-@includes.selfupdate_message(beta)
+@includes.selfupdate_message(beta)
diff --git a/app/views/selfupdate_stable.scala.txt b/app/views/selfupdate_stable.scala.txt
@@ -107,10 +107,6 @@ if ! grep 'sdkman_auto_env' "${sdkman_config_file_tmp}"; then
 	echo "sdkman_auto_env=false" >> "$sdkman_config_file_tmp"
 fi
 
-if ! grep 'sdkman_rosetta2_compatible' "${sdkman_config_file_tmp}"; then
-	echo "sdkman_rosetta2_compatible=false" >> "$sdkman_config_file_tmp"
-fi
-
 if ! grep 'sdkman_checksum_enable' "${sdkman_config_file_tmp}"; then
 	echo "sdkman_checksum_enable=true" >> "$sdkman_config_file_tmp"
 fi
@@ -157,4 +153,4 @@ echo "$SDKMAN_NATIVE_VERSION" > "${SDKMAN_DIR}/var/version_native"
 rm -rf "${SDKMAN_DIR}"/tmp
 mkdir "${SDKMAN_DIR}"/tmp
 
-@includes.selfupdate_message(beta)
+@includes.selfupdate_message(beta)