From 0b3d593bfd934359fd9278adc79b98de7c78132b Mon Sep 17 00:00:00 2001 From: izzues <60892516+izzues@users.noreply.github.com> Date: Wed, 22 Jun 2022 14:37:10 -0300 Subject: [PATCH] Use portable shebangs in wrapper scripts (#79) This is the recommended approach and it's necessary on systems like NixOS. See: https://web.archive.org/web/20220617225709/https://unix.stackexchange.com/questions/29608/why-is-it-better-to-use-usr-bin-env-name-instead-of-path-to-name-as-my --- Dockerfile.template | 4 ++-- chrome/Dockerfile.alpine | 4 ++-- chrome/curl_chrome100 | 2 +- chrome/curl_chrome101 | 2 +- chrome/curl_chrome99 | 2 +- chrome/curl_chrome99_android | 2 +- chrome/curl_edge101 | 2 +- chrome/curl_edge99 | 2 +- chrome/curl_safari15_3 | 2 +- firefox/Dockerfile.alpine | 4 ++-- firefox/curl_ff100 | 2 +- firefox/curl_ff91esr | 2 +- firefox/curl_ff95 | 2 +- firefox/curl_ff98 | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 5d6fc40..26feb79 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -219,8 +219,8 @@ COPY curl_ff* out/ COPY curl_chrome* curl_edge* curl_safari* out/ {{/chrome}} {{#alpine}} -# Replace /bin/bash with /bin/ash -RUN sed -i 's@/bin/bash@/bin/ash@' out/curl_* +# Replace /usr/bin/env bash with /usr/bin/env ash +RUN sed -i 's@/usr/bin/env bash@/usr/bin/env ash@' out/curl_* {{/alpine}} RUN chmod +x out/curl_* {{#alpine}} diff --git a/chrome/Dockerfile.alpine b/chrome/Dockerfile.alpine index 4f6e05e..7a47179 100644 --- a/chrome/Dockerfile.alpine +++ b/chrome/Dockerfile.alpine @@ -130,8 +130,8 @@ RUN ! (ldd ./out/curl-impersonate | grep -q -e nghttp2 -e brotli -e ssl -e crypt # Wrapper scripts COPY curl_chrome* curl_edge* curl_safari* out/ -# Replace /bin/bash with /bin/ash -RUN sed -i 's@/bin/bash@/bin/ash@' out/curl_* +# Replace /usr/bin/env bash with /usr/bin/env ash +RUN sed -i 's@/usr/bin/env bash@/usr/bin/env ash@' out/curl_* RUN chmod +x out/curl_* # When using alpine, create a final, minimal image with the compiled binaries diff --git a/chrome/curl_chrome100 b/chrome/curl_chrome100 index 6c757bc..fe82dfb 100755 --- a/chrome/curl_chrome100 +++ b/chrome/curl_chrome100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_chrome101 b/chrome/curl_chrome101 index 4a52589..7073f3a 100755 --- a/chrome/curl_chrome101 +++ b/chrome/curl_chrome101 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_chrome99 b/chrome/curl_chrome99 index 427b82c..079538a 100755 --- a/chrome/curl_chrome99 +++ b/chrome/curl_chrome99 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_chrome99_android b/chrome/curl_chrome99_android index 5c04273..9bf6bf6 100755 --- a/chrome/curl_chrome99_android +++ b/chrome/curl_chrome99_android @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_edge101 b/chrome/curl_edge101 index e07c1b2..654298f 100755 --- a/chrome/curl_edge101 +++ b/chrome/curl_edge101 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_edge99 b/chrome/curl_edge99 index e4c9698..1a3e55b 100755 --- a/chrome/curl_edge99 +++ b/chrome/curl_edge99 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/chrome/curl_safari15_3 b/chrome/curl_safari15_3 index 50163a7..71b5b15 100755 --- a/chrome/curl_safari15_3 +++ b/chrome/curl_safari15_3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/firefox/Dockerfile.alpine b/firefox/Dockerfile.alpine index 7fa573f..449a016 100644 --- a/firefox/Dockerfile.alpine +++ b/firefox/Dockerfile.alpine @@ -120,8 +120,8 @@ RUN ! (ldd ./out/curl-impersonate | grep -q -e nghttp2 -e brotli -e ssl -e crypt # Wrapper scripts COPY curl_ff* out/ -# Replace /bin/bash with /bin/ash -RUN sed -i 's@/bin/bash@/bin/ash@' out/curl_* +# Replace /usr/bin/env bash with /usr/bin/env ash +RUN sed -i 's@/usr/bin/env bash@/usr/bin/env ash@' out/curl_* RUN chmod +x out/curl_* # When using alpine, create a final, minimal image with the compiled binaries diff --git a/firefox/curl_ff100 b/firefox/curl_ff100 index 35b7067..cf740eb 100755 --- a/firefox/curl_ff100 +++ b/firefox/curl_ff100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/firefox/curl_ff91esr b/firefox/curl_ff91esr index 03d7dbd..7520c74 100755 --- a/firefox/curl_ff91esr +++ b/firefox/curl_ff91esr @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/firefox/curl_ff95 b/firefox/curl_ff95 index a3a6238..bf11f90 100755 --- a/firefox/curl_ff95 +++ b/firefox/curl_ff95 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*} diff --git a/firefox/curl_ff98 b/firefox/curl_ff98 index 087e41d..c49cfcb 100755 --- a/firefox/curl_ff98 +++ b/firefox/curl_ff98 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Find the directory of this script dir=${0%/*}