From 1f5e23aedbd5dcde7f0f10423459141c89698a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 25 Jan 2018 12:11:32 +0100 Subject: [PATCH] scripts: make absolute paths consistent Change absolute binary paths in scripts to /usr/bin/env or make them relative. This allows the scripts to be used on linux distributions like NixOS, where binaries are not located in /usr/ or /bin/. --- Makefile | 2 +- bin/decrypt_names.py | 2 +- bin/make_manual.py | 2 +- bin/upload-github | 2 +- cmd/info/all.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index eed40bca4..d494b999a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SHELL = /bin/bash +SHELL = bash TAG := $(shell echo `git describe --abbrev=8 --tags`-`git rev-parse --abbrev-ref HEAD` | sed 's/-\([0-9]\)-/-00\1-/; s/-\([0-9][0-9]\)-/-0\1-/; s/-\(HEAD\|master\)$$//') LAST_TAG := $(shell git describe --tags --abbrev=0) NEW_TAG := $(shell echo $(LAST_TAG) | perl -lpe 's/v//; $$_ += 0.01; $$_ = sprintf("v%.2f", $$_)') diff --git a/bin/decrypt_names.py b/bin/decrypt_names.py index 855d58b2b..1fec84c61 100755 --- a/bin/decrypt_names.py +++ b/bin/decrypt_names.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ This is a tool to decrypt file names in rclone logs. diff --git a/bin/make_manual.py b/bin/make_manual.py index 5cb42f163..6de72d79f 100755 --- a/bin/make_manual.py +++ b/bin/make_manual.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ Make single page versions of the documentation for release and conversion into man pages etc. diff --git a/bin/upload-github b/bin/upload-github index 0bd245fed..aa5bd196b 100755 --- a/bin/upload-github +++ b/bin/upload-github @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # # Upload a release # diff --git a/cmd/info/all.sh b/cmd/info/all.sh index b90354dbe..68d5811e6 100755 --- a/cmd/info/all.sh +++ b/cmd/info/all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash exec rclone --check-normalization=true --check-control=true --check-length=true info \ /tmp/testInfo \ TestAmazonCloudDrive:testInfo \