From aed77a8fb28775113ed986252efe7b3daab541bb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 May 2024 12:01:58 +0200 Subject: [PATCH] tree-wide: replace /bin/bash with /usr/bin/env bash The latter is more portable, while the former only works on systems where /bin/bash exists (or is symlinked appropriately). --- backend/sharefile/update-timezone.sh | 2 +- bin/backend-versions.sh | 2 +- bin/bisect-go-rclone.sh | 2 +- bin/bisect-rclone.sh | 2 +- bin/build-xgo-cgofuse.sh | 2 +- bin/make_rc_docs.sh | 2 +- bin/test-repeat-vfs.sh | 2 +- bin/test-repeat.sh | 2 +- bin/use-deadlock-detector | 2 +- cmd/serve/restic/restic-test.sh | 2 +- docs/content/oracleobjectstorage/tutorial_mount.md | 2 +- fstest/testserver/images/test-hdfs/run.sh | 2 +- fstest/testserver/init.d/TestFTPProftpd | 2 +- fstest/testserver/init.d/TestFTPPureftpd | 2 +- fstest/testserver/init.d/TestFTPRclone | 2 +- fstest/testserver/init.d/TestFTPVsftpd | 2 +- fstest/testserver/init.d/TestFTPVsftpdTLS | 2 +- fstest/testserver/init.d/TestHdfs | 2 +- fstest/testserver/init.d/TestS3Minio | 2 +- fstest/testserver/init.d/TestS3MinioEdge | 2 +- fstest/testserver/init.d/TestS3Rclone | 2 +- fstest/testserver/init.d/TestSFTPOpenssh | 2 +- fstest/testserver/init.d/TestSFTPRclone | 2 +- fstest/testserver/init.d/TestSFTPRcloneSSH | 2 +- fstest/testserver/init.d/TestSMB | 2 +- fstest/testserver/init.d/TestSeafile | 2 +- fstest/testserver/init.d/TestSeafileEncrypted | 2 +- fstest/testserver/init.d/TestSeafileV6 | 2 +- fstest/testserver/init.d/TestSia | 2 +- fstest/testserver/init.d/TestSwiftAIO | 2 +- fstest/testserver/init.d/TestWebdavNextcloud | 2 +- fstest/testserver/init.d/TestWebdavOwncloud | 2 +- fstest/testserver/init.d/TestWebdavRclone | 2 +- fstest/testserver/init.d/docker.bash | 2 +- fstest/testserver/init.d/rclone-serve.bash | 2 +- fstest/testserver/init.d/run.bash | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/backend/sharefile/update-timezone.sh b/backend/sharefile/update-timezone.sh index ae5eecc63..7088734ad 100755 --- a/backend/sharefile/update-timezone.sh +++ b/backend/sharefile/update-timezone.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/bin/backend-versions.sh b/bin/backend-versions.sh index 3fb21cc81..f6fb0bdb5 100755 --- a/bin/backend-versions.sh +++ b/bin/backend-versions.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # This adds the version each backend was released to its docs page set -e for backend in $( find backend -maxdepth 1 -type d ); do diff --git a/bin/bisect-go-rclone.sh b/bin/bisect-go-rclone.sh index ed675c609..aa3e18cc9 100755 --- a/bin/bisect-go-rclone.sh +++ b/bin/bisect-go-rclone.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # An example script to run when bisecting go with git bisect -run when # looking for an rclone regression diff --git a/bin/bisect-rclone.sh b/bin/bisect-rclone.sh index ed24c0228..ce6ee9b40 100755 --- a/bin/bisect-rclone.sh +++ b/bin/bisect-rclone.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Example script for git bisect run # diff --git a/bin/build-xgo-cgofuse.sh b/bin/build-xgo-cgofuse.sh index 01908dfcc..4f57dbc84 100755 --- a/bin/build-xgo-cgofuse.sh +++ b/bin/build-xgo-cgofuse.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e docker build -t rclone/xgo-cgofuse https://github.com/winfsp/cgofuse.git docker images diff --git a/bin/make_rc_docs.sh b/bin/make_rc_docs.sh index 55520228c..44e9ddd02 100755 --- a/bin/make_rc_docs.sh +++ b/bin/make_rc_docs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Insert the rc docs into docs/content/rc.md set -e diff --git a/bin/test-repeat-vfs.sh b/bin/test-repeat-vfs.sh index c9702a870..9d41a6b35 100755 --- a/bin/test-repeat-vfs.sh +++ b/bin/test-repeat-vfs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Thrash the VFS tests set -e diff --git a/bin/test-repeat.sh b/bin/test-repeat.sh index 9ab243f07..c3f06b8a0 100755 --- a/bin/test-repeat.sh +++ b/bin/test-repeat.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # defaults buildflags="" diff --git a/bin/use-deadlock-detector b/bin/use-deadlock-detector index ca56026b8..1c47d930d 100755 --- a/bin/use-deadlock-detector +++ b/bin/use-deadlock-detector @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ ! -z $(git status --short --untracked-files=no) ]]; then echo "Detected uncommitted changes - commit before running this" diff --git a/cmd/serve/restic/restic-test.sh b/cmd/serve/restic/restic-test.sh index b26160d0b..15c19db5f 100755 --- a/cmd/serve/restic/restic-test.sh +++ b/cmd/serve/restic/restic-test.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Test all the remotes against restic integration test # Run with: screen -S restic-test -L ./restic-test.sh diff --git a/docs/content/oracleobjectstorage/tutorial_mount.md b/docs/content/oracleobjectstorage/tutorial_mount.md index 85364d0aa..efc4e11c9 100644 --- a/docs/content/oracleobjectstorage/tutorial_mount.md +++ b/docs/content/oracleobjectstorage/tutorial_mount.md @@ -330,7 +330,7 @@ then auto-mounting. Content of /etc/rclone/scripts/rclone_nanny_script.sh ```shell -#!/bin/bash +#!/usr/bin/env bash erroneous_list=$(df 2>&1 | grep -i 'Transport endpoint is not connected' | awk '{print ""$2"" }' | tr -d \:) rclone_list=$(findmnt -t fuse.rclone -n 2>&1 | awk '{print ""$1"" }' | tr -d \:) IFS=$'\n'; set -f diff --git a/fstest/testserver/images/test-hdfs/run.sh b/fstest/testserver/images/test-hdfs/run.sh index 0009c6306..207e11a49 100755 --- a/fstest/testserver/images/test-hdfs/run.sh +++ b/fstest/testserver/images/test-hdfs/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash KERBEROS=${KERBEROS-"false"} diff --git a/fstest/testserver/init.d/TestFTPProftpd b/fstest/testserver/init.d/TestFTPProftpd index 10df10f64..029909acc 100755 --- a/fstest/testserver/init.d/TestFTPProftpd +++ b/fstest/testserver/init.d/TestFTPProftpd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestFTPPureftpd b/fstest/testserver/init.d/TestFTPPureftpd index 4b66b84d9..69c9285cd 100755 --- a/fstest/testserver/init.d/TestFTPPureftpd +++ b/fstest/testserver/init.d/TestFTPPureftpd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestFTPRclone b/fstest/testserver/init.d/TestFTPRclone index c91f5acec..85ad26a39 100755 --- a/fstest/testserver/init.d/TestFTPRclone +++ b/fstest/testserver/init.d/TestFTPRclone @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestFTPVsftpd b/fstest/testserver/init.d/TestFTPVsftpd index d20e637df..d33dcf051 100755 --- a/fstest/testserver/init.d/TestFTPVsftpd +++ b/fstest/testserver/init.d/TestFTPVsftpd @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestFTPVsftpdTLS b/fstest/testserver/init.d/TestFTPVsftpdTLS index 7131b7c46..ebcd3b09b 100755 --- a/fstest/testserver/init.d/TestFTPVsftpdTLS +++ b/fstest/testserver/init.d/TestFTPVsftpdTLS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestHdfs b/fstest/testserver/init.d/TestHdfs index cfef84270..198c47606 100755 --- a/fstest/testserver/init.d/TestHdfs +++ b/fstest/testserver/init.d/TestHdfs @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestS3Minio b/fstest/testserver/init.d/TestS3Minio index 4a599d457..b4d3dde96 100755 --- a/fstest/testserver/init.d/TestS3Minio +++ b/fstest/testserver/init.d/TestS3Minio @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestS3MinioEdge b/fstest/testserver/init.d/TestS3MinioEdge index 459dbb903..399ec7fb7 100755 --- a/fstest/testserver/init.d/TestS3MinioEdge +++ b/fstest/testserver/init.d/TestS3MinioEdge @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestS3Rclone b/fstest/testserver/init.d/TestS3Rclone index 13c94fc60..c336322c2 100755 --- a/fstest/testserver/init.d/TestS3Rclone +++ b/fstest/testserver/init.d/TestS3Rclone @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSFTPOpenssh b/fstest/testserver/init.d/TestSFTPOpenssh index 5b67f7923..91a9c9a1f 100755 --- a/fstest/testserver/init.d/TestSFTPOpenssh +++ b/fstest/testserver/init.d/TestSFTPOpenssh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSFTPRclone b/fstest/testserver/init.d/TestSFTPRclone index 21fb82885..f553112b9 100755 --- a/fstest/testserver/init.d/TestSFTPRclone +++ b/fstest/testserver/init.d/TestSFTPRclone @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSFTPRcloneSSH b/fstest/testserver/init.d/TestSFTPRcloneSSH index 4c5bf8eb7..989a5e6b8 100755 --- a/fstest/testserver/init.d/TestSFTPRcloneSSH +++ b/fstest/testserver/init.d/TestSFTPRcloneSSH @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSMB b/fstest/testserver/init.d/TestSMB index 56bf16552..4e10d5928 100755 --- a/fstest/testserver/init.d/TestSMB +++ b/fstest/testserver/init.d/TestSMB @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSeafile b/fstest/testserver/init.d/TestSeafile index 0d1357cd4..c18a1d0db 100755 --- a/fstest/testserver/init.d/TestSeafile +++ b/fstest/testserver/init.d/TestSeafile @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSeafileEncrypted b/fstest/testserver/init.d/TestSeafileEncrypted index 75db82c63..0493e9082 100755 --- a/fstest/testserver/init.d/TestSeafileEncrypted +++ b/fstest/testserver/init.d/TestSeafileEncrypted @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSeafileV6 b/fstest/testserver/init.d/TestSeafileV6 index bb6cddf1e..1ed076c44 100755 --- a/fstest/testserver/init.d/TestSeafileV6 +++ b/fstest/testserver/init.d/TestSeafileV6 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSia b/fstest/testserver/init.d/TestSia index 64e38c661..9b11cafa2 100755 --- a/fstest/testserver/init.d/TestSia +++ b/fstest/testserver/init.d/TestSia @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestSwiftAIO b/fstest/testserver/init.d/TestSwiftAIO index 1f5ca8c70..7a04d63ff 100755 --- a/fstest/testserver/init.d/TestSwiftAIO +++ b/fstest/testserver/init.d/TestSwiftAIO @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestWebdavNextcloud b/fstest/testserver/init.d/TestWebdavNextcloud index 1fe8c6e86..42766e515 100755 --- a/fstest/testserver/init.d/TestWebdavNextcloud +++ b/fstest/testserver/init.d/TestWebdavNextcloud @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestWebdavOwncloud b/fstest/testserver/init.d/TestWebdavOwncloud index 41c40d947..f80b1852a 100755 --- a/fstest/testserver/init.d/TestWebdavOwncloud +++ b/fstest/testserver/init.d/TestWebdavOwncloud @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/TestWebdavRclone b/fstest/testserver/init.d/TestWebdavRclone index b0716dc7b..e740eccf1 100755 --- a/fstest/testserver/init.d/TestWebdavRclone +++ b/fstest/testserver/init.d/TestWebdavRclone @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/fstest/testserver/init.d/docker.bash b/fstest/testserver/init.d/docker.bash index 442738986..4a3dd9ecc 100644 --- a/fstest/testserver/init.d/docker.bash +++ b/fstest/testserver/init.d/docker.bash @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash stop() { if status ; then diff --git a/fstest/testserver/init.d/rclone-serve.bash b/fstest/testserver/init.d/rclone-serve.bash index a2a9d15b5..408960e79 100644 --- a/fstest/testserver/init.d/rclone-serve.bash +++ b/fstest/testserver/init.d/rclone-serve.bash @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # start an "rclone serve" server diff --git a/fstest/testserver/init.d/run.bash b/fstest/testserver/init.d/run.bash index fa7994448..ee2a14eef 100644 --- a/fstest/testserver/init.d/run.bash +++ b/fstest/testserver/init.d/run.bash @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash case "$1" in start)