fixup! feat: use largest writable tmpfs that allows executables

hugojosefson · Mar 31, 2024 · 5b42559 · 5b42559
1 parent d9809a6
commit 5b42559
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 27 deletions.
diff --git a/example b/example
@@ -48,6 +48,7 @@ ensure_command_installed() {
   fi
 }
 
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
 

diff --git a/example-piped b/example-piped
@@ -48,20 +48,14 @@ ensure_command_installed() {
   fi
 }
 
-DENO_VERSION_RANGE_URL_ENCODED="$(printf '%s' "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
 
 get_largest_usable_tmpfs() {
-  mount \
-  | grep '\btype tmpfs\b' \
-  | grep -v '\bnoexec\b' \
-  | grep -v '\bro\b' \
-  | cut -d' ' -f3 \
-  | xargs df --output=avail,target \
-  | tail -n+2 \
+  findmnt -Ononoexec,noro -ttmpfs -nboAVAIL,TARGET \
   | sort -rn \
   | head -n1 \
-  | cut -d' ' -f2
+  | cut -d\  -f2
 }
 
 get_tmp_dir() {

diff --git a/example-piped.ts b/example-piped.ts
@@ -48,20 +48,14 @@ ensure_command_installed() {
   fi
 }
 
-DENO_VERSION_RANGE_URL_ENCODED="$(printf '%s' "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
 
 get_largest_usable_tmpfs() {
-  mount \
-  | grep '\btype tmpfs\b' \
-  | grep -v '\bnoexec\b' \
-  | grep -v '\bro\b' \
-  | cut -d' ' -f3 \
-  | xargs df --output=avail,target \
-  | tail -n+2 \
+  findmnt -Ononoexec,noro -ttmpfs -nboAVAIL,TARGET \
   | sort -rn \
   | head -n1 \
-  | cut -d' ' -f2
+  | cut -d\  -f2
 }
 
 get_tmp_dir() {

diff --git a/example.ts b/example.ts
@@ -48,6 +48,7 @@ ensure_command_installed() {
   fi
 }
 
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
 

diff --git a/src/deno-shebang-piped.sh b/src/deno-shebang-piped.sh
@@ -48,20 +48,14 @@ ensure_command_installed() {
   fi
 }
 
-DENO_VERSION_RANGE_URL_ENCODED="$(printf '%s' "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
 
 get_largest_usable_tmpfs() {
-  mount \
-  | grep '\btype tmpfs\b' \
-  | grep -v '\bnoexec\b' \
-  | grep -v '\bro\b' \
-  | cut -d' ' -f3 \
-  | xargs df --output=avail,target \
-  | tail -n+2 \
+  findmnt -Ononoexec,noro -ttmpfs -nboAVAIL,TARGET \
   | sort -rn \
   | head -n1 \
-  | cut -d' ' -f2
+  | cut -d\  -f2
 }
 
 get_tmp_dir() {

diff --git a/src/deno-shebang.sh b/src/deno-shebang.sh
@@ -48,6 +48,7 @@ ensure_command_installed() {
   fi
 }
 
+DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
 DEFAULT_DENO="$(command -v deno || true)"
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,7 @@ ensure_command_installed() { @@
       fi
     }
+    DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
     DENO_VERSION_RANGE_URL_ENCODED="$(printf "%s" "${DENO_VERSION_RANGE}" | xxd -p | tr -d '\n' | sed 's/\(..\)/%\1/g')"
     DEFAULT_DENO="$(command -v deno || true)"
@@ Expand Down @@