fix wsl support, use tree for unzipitar errors

README.md

@@ -38,6 +38,7 @@ Dorothy maintainers are daily driving Dorothy on:
 Dorothy users are daily driving Dorothy on:
 
 -   Manjaro/Arch on Intel/AMD (x86_64)
+-   Windows 10 via [Ubuntu](https://ubuntu.com/wsl) [WSL2](https://docs.microsoft.com/en-au/windows/wsl/) on Intel/AMD (x86_64)
 -   Windows 11 via [Ubuntu](https://ubuntu.com/wsl) [WSL2](https://docs.microsoft.com/en-au/windows/wsl/) on Intel/AMD (x86_64)
 
 Dorothy maintainers and users are occasionally driving Dorothy on:
@@ -63,6 +64,15 @@ macOS:
 xcode-select --install
 ```
 
+Windows 10/11:
+
+```bash
+# [Install WSL.](https://learn.microsoft.com/en-au/windows/wsl/install)
+wsl --install
+wsl --set-default-version 2
+# note that [wsl --version] does not report WSL2, you need to do [wsl -l -v]
+```
+
 Ubuntu / Debian / Kali:
 
 ```bash

commands/is-linux

@@ -20,6 +20,7 @@ function is_linux_test() (
 function is_linux() (
 	source "$DOROTHY/sources/bash.bash"
 
+	# this will/should pass on WSL on Windows
 	if test "$(uname -s)" = 'Linux'; then
 		return 0
 	else

commands/setup-util

@@ -3342,7 +3342,12 @@ function setup_util() (
 		# ensure it is executable, then open or run it
 		chmod +x "$filepath"
 		if test "$__open" = 'yes'; then
-			open "$filepath"
+			if is-wsl; then
+				setup-util-wslu --quiet
+				wslview "$filepath"
+			else
+				open "$filepath"
+			fi
 		else
 			# external installer script
 			"$filepath"

commands/setup-util-bat

@@ -59,7 +59,7 @@ function setup_util_bat() (
 	function add_download_option {
 		options+=(
 			DOWNLOAD="$(get_github_asset_url "$1")"
-			DOWNLOAD_UNZIP_FILTER='*/bat'
+			DOWNLOAD_UNZIP_FILTER="*/$2"
 		)
 	}
 	function add_deb_option {
@@ -70,25 +70,25 @@ function setup_util_bat() (
 	arch="$(get-arch)"
 	if is-mac; then
 		add_download_option '-x86_64-apple-darwin.tar.gz'
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_download_option '-x86_64-pc-windows-msvc.zip'
-		elif test "$arch" = 'x32'; then
-			add_download_option '-i686-pc-windows-msvc.zip'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
 			add_deb_option '_arm64.deb'
-			add_download_option '-aarch64-unknown-linux-gnu.tar.gz'
+			add_download_option '-aarch64-unknown-linux-gnu.tar.gz' 'bat'
 		elif test "$arch" = 'a32'; then
 			add_deb_option '_armhf.deb'
-			add_download_option '-arm-unknown-linux-musl.tar.gz'
+			add_download_option '-arm-unknown-linux-musl.tar.gz' 'bat'
 		elif test "$arch" = 'x64'; then
 			add_deb_option '_amd64.deb'
-			add_download_option '-x86_64-unknown-linux-musl.tar.gz'
+			add_download_option '-x86_64-unknown-linux-musl.tar.gz' 'bat'
 		elif test "$arch" = 'x32'; then
 			add_deb_option '_i686.deb'
-			add_download_option '-i686-unknown-linux-musl.tar.gz'
+			add_download_option '-i686-unknown-linux-musl.tar.gz' 'bat'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'x64'; then
+			add_download_option '-x86_64-pc-windows-msvc.zip' 'bat.exe'
+		elif test "$arch" = 'x32'; then
+			add_download_option '-i686-pc-windows-msvc.zip' 'bat.exe'
 		fi
 	fi
 	setup-util "${options[@]}"

commands/setup-util-bottom

@@ -84,11 +84,7 @@ function setup_util_bottom() (
 	}
 	if is-mac; then
 		add_download_option '_x86_64-apple-darwin.tar.gz'
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_installer_option '_x86_64_installer.msi'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
 			add_download_option '_aarch64-unknown-linux-gnu.tar.gz'
 		elif test "$arch" = 'a32'; then
@@ -101,6 +97,11 @@ function setup_util_bottom() (
 			add_download_option '_riscv64gc-unknown-linux-gnu.tar.gz'
 		fi
 	fi
+	# .msi failed with: This installation package could not be opened. Contact the application vendor to verify that this is a valid Windows Installer package.
+	# elif is-wsl; then
+	# 	if test "$arch" = 'x64'; then
+	# 		add_installer_option '_x86_64_installer.msi'
+	# 	fi
 	setup-util "${options[@]}"
 )
 

commands/setup-util-carapace

@@ -35,12 +35,11 @@ function setup_util_carapace() (
 	fi
 
 	# setup
+	# couldn't get APT to work, APT_REPO was malformed
 	local arch options=(
 		--cli='carapace'
 		"$@"
 		AUR='carapace-bin' # ARCH
-		APT_REPO='deb [trusted=yes] https://apt.fury.io/rsteube/ /'
-		APT='carapace-bin'
 		BREW_TAP='rsteube/homebrew-tap'
 		BREW='rsteube/tap/carapace'
 		NIX='carapace'
@@ -64,16 +63,10 @@ function setup_util_carapace() (
 			--release='latest' \
 			--asset-filter="$(echo-escape-regex -- "$1")$" | echo-first-line || :
 	}
-	function add_download_option {
-		options+=(
-			DOWNLOAD="$(get_github_asset_url "$@")"
-			DOWNLOAD_UNZIP_FILTER='carapace'
-		)
-	}
 	function add_download_option {
 		options+=(
 			DOWNLOAD="$(get_github_asset_url "$1")"
-			DOWNLOAD_UNZIP_FILTER='gum'
+			DOWNLOAD_UNZIP_FILTER="$2"
 		)
 	}
 	function add_apk_option {
@@ -98,30 +91,30 @@ function setup_util_carapace() (
 		elif test "$arch" = 'x64'; then
 			add_download_option '_darwin_amd64.tar.gz'
 		fi
-	elif is-wsl; then
-		if test "$arch" = 'a64'; then
-			add_download_option '_windows_arm64.zip'
-		elif test "$arch" = 'x64'; then
-			add_download_option '_windows_amd64.zip'
-		elif test "$arch" = 'x32'; then
-			add_download_option '_windows_386.zip'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
 			add_apk_option '_linux_arm64.apk'
 			add_deb_option '_linux_arm64.deb'
 			add_rpm_option '_linux_arm64.rpm'
-			add_download_option '_linux_arm64.tar.gz'
+			add_download_option '_linux_arm64.tar.gz' 'carapace'
 		elif test "$arch" = 'x64'; then
 			add_apk_option '_linux_amd64.apk'
 			add_deb_option '_linux_amd64.deb'
 			add_rpm_option '_linux_amd64.rpm'
-			add_download_option '_linux_amd64.tar.gz'
+			add_download_option '_linux_amd64.tar.gz' 'carapace'
 		elif test "$arch" = 'x32'; then
 			add_apk_option '_linux_386.apk'
 			add_deb_option '_linux_386.deb'
 			add_rpm_option '_linux_386.rpm'
-			add_download_option '_linux_386.tar.gz'
+			add_download_option '_linux_386.tar.gz' 'carapace'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'a64'; then
+			add_download_option '_windows_arm64.zip' 'carapace.exe'
+		elif test "$arch" = 'x64'; then
+			add_download_option '_windows_amd64.zip' 'carapace.exe'
+		elif test "$arch" = 'x32'; then
+			add_download_option '_windows_386.zip' 'carapace.exe'
 		fi
 	fi
 	setup-util "${options[@]}"

commands/setup-util-cronitor

@@ -31,27 +31,27 @@ function setup_util_cronitor() (
 	function add_download_option {
 		options+=(
 			DOWNLOAD="$(get_github_asset_url "$1")"
-			DOWNLOAD_UNZIP_FILTER='cronitor'
+			DOWNLOAD_UNZIP_FILTER="$2"
 		)
 	}
 	arch="$(get-arch)"
 	if is-mac; then
 		if test "$arch" = 'a64'; then
-			add_download_option 'darwin_arm64.tar.gz'
+			add_download_option 'darwin_arm64.tar.gz' 'cronitor'
 		else
-			add_download_option 'darwin_amd64.tar.gz'
+			add_download_option 'darwin_amd64.tar.gz' 'cronitor'
 		fi
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_download_option 'windows_amd64.tar.gz'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
-			add_download_option 'linux_arm64.tar.gz'
+			add_download_option 'linux_arm64.tar.gz' 'cronitor'
 		elif test "$arch" = 'a32'; then
-			add_download_option 'linux_arm.tar.gz'
+			add_download_option 'linux_arm.tar.gz' 'cronitor'
 		elif test "$arch" = 'x64'; then
-			add_download_option 'linux_amd64.tar.gz'
+			add_download_option 'linux_amd64.tar.gz' 'cronitor'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'x64'; then
+			add_download_option 'windows_amd64.zip' 'cronitor.exe'
 		fi
 	fi
 	setup-util "${options[@]}"

commands/setup-util-delta

@@ -53,7 +53,7 @@ function setup_util_delta() (
 	function add_download_option {
 		options+=(
 			DOWNLOAD="$(get_github_asset_url "$1")"
-			DOWNLOAD_UNZIP_FILTER='*/delta'
+			DOWNLOAD_UNZIP_FILTER="*/$2"
 		)
 	}
 	function add_deb_option {
@@ -64,27 +64,27 @@ function setup_util_delta() (
 	arch="$(get-arch)"
 	if is-mac; then
 		if test "$arch" = 'a64'; then
-			add_download_option '-aarch64-apple-darwin.tar.gz'
+			add_download_option '-aarch64-apple-darwin.tar.gz' 'delta'
 		elif test "$arch" = 'x64'; then
-			add_download_option '-x86_64-apple-darwin.tar.gz'
+			add_download_option '-x86_64-apple-darwin.tar.gz' 'delta'
 		fi
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_download_option '-x86_64-pc-windows-msvc.zip'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
 			add_deb_option '_arm64.deb'
-			add_download_option '-aarch64-unknown-linux-gnu.tar.gz'
+			add_download_option '-aarch64-unknown-linux-gnu.tar.gz' 'delta'
 		elif test "$arch" = 'a32'; then
 			add_deb_option '_armhf.deb'
-			add_download_option '-arm-unknown-linux-gnueabihf.tar.gz'
+			add_download_option '-arm-unknown-linux-gnueabihf.tar.gz' 'delta'
 		elif test "$arch" = 'x64'; then
 			add_deb_option '_amd64.deb'
-			add_download_option '-x86_64-unknown-linux-musl.tar.gz'
+			add_download_option '-x86_64-unknown-linux-musl.tar.gz' 'delta'
 		elif test "$arch" = 'x32'; then
 			add_deb_option '_i386.deb'
-			add_download_option '-i686-unknown-linux-gnu.tar.gz'
+			add_download_option '-i686-unknown-linux-gnu.tar.gz' 'delta'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'x64'; then
+			add_download_option '-x86_64-pc-windows-msvc.zip' 'delta.exe'
 		fi
 	fi
 	setup-util "${options[@]}"

commands/setup-util-deno

@@ -50,25 +50,31 @@ function setup_util_deno() (
 	}
 	function add_download_option {
 		options+=(
-			DOWNLOAD="$(get_github_asset_url "$@")"
-			DOWNLOAD_UNZIP_FILTER='deno'
+			DOWNLOAD="$(get_github_asset_url "$1")"
+			DOWNLOAD_UNZIP_FILTER="$2"
+		)
+	}
+	function add_download_option_arm {
+		options+=(
+			DOWNLOAD="$(get_github_asset_url "$1" 'LukeChannings/deno-arm64')"
+			DOWNLOAD_UNZIP_FILTER="$2"
 		)
 	}
 	if is-mac; then
 		if test "$arch" = 'a64'; then
-			add_download_option 'deno-aarch64-apple-darwin.zip'
+			add_download_option 'deno-aarch64-apple-darwin.zip' 'deno'
 		elif test "$arch" = 'x64'; then
-			add_download_option 'deno-x86_64-apple-darwin.zip'
+			add_download_option 'deno-x86_64-apple-darwin.zip' 'deno'
 		fi
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_download_option 'deno-x86_64-pc-windows-msvc.zip'
-		fi
-	else
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
-			add_download_option 'deno-linux-arm64.zip' 'LukeChannings/deno-arm64'
+			add_download_option_arm 'deno-linux-arm64.zip' 'deno'
 		elif test "$arch" = 'x64'; then
-			add_download_option 'deno-x86_64-unknown-linux-gnu.zip'
+			add_download_option 'deno-x86_64-unknown-linux-gnu.zip' 'deno'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'x64'; then
+			add_download_option 'deno-x86_64-pc-windows-msvc.zip' 'deno.exe'
 		fi
 	fi
 	setup-util "${options[@]}"

commands/setup-util-dust

@@ -45,7 +45,7 @@ function setup_util_dust() (
 	function add_download_option {
 		options+=(
 			DOWNLOAD="$(get_github_asset_url "$1")"
-			DOWNLOAD_UNZIP_FILTER='*/dust'
+			DOWNLOAD_UNZIP_FILTER="*/$2"
 		)
 	}
 	function add_deb_option {
@@ -54,24 +54,24 @@ function setup_util_dust() (
 		)
 	}
 	if is-mac; then
-		add_download_option 'x86_64-apple-darwin.tar.gz'
-	elif is-wsl; then
-		if test "$arch" = 'x64'; then
-			add_download_option '-x86_64-pc-windows-msvc.zip'
-		elif test "$arch" = 'x32'; then
-			add_download_option '-i686-pc-windows-msvc.zip'
-		fi
-	else
+		add_download_option 'x86_64-apple-darwin.tar.gz' 'dust'
+	elif is-linux; then
 		if test "$arch" = 'a64'; then
-			add_download_option '-aarch64-unknown-linux-musl.tar.gz'
+			add_download_option '-aarch64-unknown-linux-musl.tar.gz' 'dust'
 		elif test "$arch" = 'a32'; then
-			add_download_option '-arm-unknown-linux-musl.tar.gz'
+			add_download_option '-arm-unknown-linux-musl.tar.gz' 'dust'
 		elif test "$arch" = 'x64'; then
 			add_deb_option '_amd64.deb'
-			add_download_option '-x86_64-unknown-linux-musl.tar.gz'
+			add_download_option '-x86_64-unknown-linux-musl.tar.gz' 'dust'
 		elif test "$arch" = 'x32'; then
 			add_deb_option '_i386.deb'
-			add_download_option '-i686-unknown-linux-musl.tar.gz'
+			add_download_option '-i686-unknown-linux-musl.tar.gz' 'dust'
+		fi
+	elif is-wsl; then
+		if test "$arch" = 'x64'; then
+			add_download_option '-x86_64-pc-windows-msvc.zip' 'dust.exe'
+		elif test "$arch" = 'x32'; then
+			add_download_option '-i686-pc-windows-msvc.zip' 'dust.exe'
 		fi
 	fi
 	setup-util "${options[@]}"