Update xquartz to 2.8.3.

fink · Dec 12, 2022 · 0d855ae · 0d855ae
1 parent ab86220
commit 0d855ae
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/srcinstaller/Install Fink.tool b/srcinstaller/Install Fink.tool
@@ -39,10 +39,10 @@ FinkDirectorY="${FinkOutDir}-${FinkVersion}"
 FinkFileName="${FinkDirectorY}.tar.gz"
 FinkSourceDLP="https://downloads.sourceforge.net/project/fink/fink/${FinkVersion}/${FinkFileName}"
 
-XQuartzVersion="2.8.2"
-XQuartzMD5Sum="4282e404cf1a59ffda2fcbfbfcfde7f0"
-XQuartzPKGPath="XQuartz.pkg"
-XQuartzFileName="XQuartz-${XQuartzVersion}.dmg"
+XQuartzVersion="2.8.3"
+XQuartzMD5Sum="e46f28b5cbb85a41a56f0e8d82f1fdfb"
+XQuartzFileName="XQuartz-${XQuartzVersion}.pkg"
+XQuartzPKGPath="${XQuartzFileName}"
 XQuartzSourceDLP="https://github.com/XQuartz/XQuartz/releases/download/XQuartz-${XQuartzVersion}/${XQuartzFileName}"
 
 
@@ -116,7 +116,7 @@ function fetchBin {
 			echo "error: Unpacking ${FileName} failed" >&2
 			exit 1
 		fi
-	elif [ "${ExtensioN}" = "dmg" ]; then
+	elif [ "${ExtensioN}" = "dmg" ] || [ "${ExtensioN}" = "pkg" ]; then
 		return
 	else
 		echo "error: Unable to unpack ${FileName}" >&2
@@ -236,11 +236,8 @@ echo "Checking for XQuartz..." >&2
 if ! pkgutil --pkg-info=org.xquartz.X11; then
 	echo "XQuartz is not installed, fetching..." >&2
 	fetchBin "${XQuartzMD5Sum}" "${XQuartzSourceDLP}" "${XQuartzFileName}" "-" "-"
-	echo "Mounting the XQuartz disk..." >&2
-	hdiutilOut="$(hdiutil mount "${XQuartzFileName}" 2>/dev/null | tr -d "\t" | grep -F '/dev/disk' | grep -Fv 'GUID_partition_scheme')"
-	XQuartzVolPath="$(echo "${hdiutilOut}" | sed -E 's:(/dev/disk[0-9])(s[0-9])?( +)?(Apple_HFS)?( +)::')"
 	echo "Starting the XQuartz install; please rerun this script when it finishes." >&2
-	open "${XQuartzVolPath}/${XQuartzPKGPath}"
+	open "${XQuartzPKGPath}"
 	exit 0
 fi