From e7e7b985ab936b5620c56a025f25814b9c3a5638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 24 Jul 2018 04:41:41 +0100 Subject: [PATCH 4/4] /bin/bash -> /usr/bin/bash --- scripts/lpf | 2 +- scripts/lpf-add-group | 2 +- scripts/lpf-approve | 2 +- scripts/lpf-build | 2 +- scripts/lpf-install | 2 +- scripts/lpf-kill-pgroup | 2 +- scripts/lpf-notify | 2 +- scripts/lpf-pkg-postun | 2 +- scripts/lpf-pkgbuild | 2 +- scripts/lpf-scan | 2 +- scripts/lpf-setup-pkg | 2 +- scripts/lpf-sudo-builddep | 2 +- scripts/lpf-sudo-install | 2 +- scripts/lpf-update | 2 +- scripts/mockbuild-helper | 2 +- scripts/sudo_askpass | 2 +- test/make_rpms | 2 +- test/remove-lpf-packages | 2 +- test/test-build-fail | 2 +- test/test-list | 2 +- test/test-notify | 2 +- test/test-remove | 2 +- test/test-remove-lpf | 2 +- test/test-update-lpf | 2 +- test/test_lpf.py | 2 +- tools/build-lpf-pkg | 2 +- tools/fix-git-setup | 2 +- tools/make_rpm | 2 +- tools/version-clean | 2 +- tools/version-smudge | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/scripts/lpf b/scripts/lpf index 14df048..74f3d30 100755 --- a/scripts/lpf +++ b/scripts/lpf @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # lpf Local Package Building Service wrapper script # diff --git a/scripts/lpf-add-group b/scripts/lpf-add-group index 7b10244..0cb856d 100755 --- a/scripts/lpf-add-group +++ b/scripts/lpf-add-group @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Add the lpf group to current user. # diff --git a/scripts/lpf-approve b/scripts/lpf-approve index 50183af..ab737b6 100755 --- a/scripts/lpf-approve +++ b/scripts/lpf-approve @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Approve packages in approve-wait state # diff --git a/scripts/lpf-build b/scripts/lpf-build index d4b7b57..d9005de 100755 --- a/scripts/lpf-build +++ b/scripts/lpf-build @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Build packages in approved queues. # diff --git a/scripts/lpf-install b/scripts/lpf-install index 041e8c2..2932841 100755 --- a/scripts/lpf-install +++ b/scripts/lpf-install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # The install command # diff --git a/scripts/lpf-kill-pgroup b/scripts/lpf-kill-pgroup index cba9e96..884091e 100755 --- a/scripts/lpf-kill-pgroup +++ b/scripts/lpf-kill-pgroup @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Use sudo to kill all children. diff --git a/scripts/lpf-notify b/scripts/lpf-notify index 417e721..3ac5534 100755 --- a/scripts/lpf-notify +++ b/scripts/lpf-notify @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # # Notification handling: create, check, hide, remove. Here is diff --git a/scripts/lpf-pkg-postun b/scripts/lpf-pkg-postun index 3c2443a..bf1a961 100755 --- a/scripts/lpf-pkg-postun +++ b/scripts/lpf-pkg-postun @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # Clean up after removed lpf package # diff --git a/scripts/lpf-pkgbuild b/scripts/lpf-pkgbuild index d9232d8..9524e0b 100755 --- a/scripts/lpf-pkgbuild +++ b/scripts/lpf-pkgbuild @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # State-changing operations, needs to be run as pkg-build user. # diff --git a/scripts/lpf-scan b/scripts/lpf-scan index a0a11bc..ffc0e2f 100755 --- a/scripts/lpf-scan +++ b/scripts/lpf-scan @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Update package state file # diff --git a/scripts/lpf-setup-pkg b/scripts/lpf-setup-pkg index 2fa507a..1101538 100755 --- a/scripts/lpf-setup-pkg +++ b/scripts/lpf-setup-pkg @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Setup package for build # diff --git a/scripts/lpf-sudo-builddep b/scripts/lpf-sudo-builddep index 9baf166..1eaa4ca 100755 --- a/scripts/lpf-sudo-builddep +++ b/scripts/lpf-sudo-builddep @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Install builddeps. Runs as root, be careful. diff --git a/scripts/lpf-sudo-install b/scripts/lpf-sudo-install index a9d91fb..7305903 100755 --- a/scripts/lpf-sudo-install +++ b/scripts/lpf-sudo-install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Install rpms, runs as root - be careful. # diff --git a/scripts/lpf-update b/scripts/lpf-update index 0871fbd..6e93b62 100755 --- a/scripts/lpf-update +++ b/scripts/lpf-update @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # The update command diff --git a/scripts/mockbuild-helper b/scripts/mockbuild-helper index 0e0f7e8..436bf73 100755 --- a/scripts/mockbuild-helper +++ b/scripts/mockbuild-helper @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Build packages in approved queues. # diff --git a/scripts/sudo_askpass b/scripts/sudo_askpass index c497739..79ac2b0 100755 --- a/scripts/sudo_askpass +++ b/scripts/sudo_askpass @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # zenity wrapper used as sudo askpass helper diff --git a/test/make_rpms b/test/make_rpms index 1d78bc7..59ba3b5 100755 --- a/test/make_rpms +++ b/test/make_rpms @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash home=$( readlink -fn $(dirname $0 ))/.. diff --git a/test/remove-lpf-packages b/test/remove-lpf-packages index 918f236..593e557 100755 --- a/test/remove-lpf-packages +++ b/test/remove-lpf-packages @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash for pkg in $( lpf list ); do to_remove="$to_remove lpf-$pkg" diff --git a/test/test-build-fail b/test/test-build-fail index 72bb420..cbf7717 100755 --- a/test/test-build-fail +++ b/test/test-build-fail @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash exec &> test-build-fail.log set -x diff --git a/test/test-list b/test/test-list index 2537336..0ec1d6b 100755 --- a/test/test-list +++ b/test/test-list @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # Test lpf list outcome. diff --git a/test/test-notify b/test/test-notify index 932c3c2..036d200 100755 --- a/test/test-notify +++ b/test/test-notify @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash scriptdir="$( dirname $( readlink -fn $0 ))/../scripts" source $scriptdir/lpf-defs.bash exec &> test-notify.log diff --git a/test/test-remove b/test/test-remove index d9e479e..b867884 100755 --- a/test/test-remove +++ b/test/test-remove @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash exec 2> test-remove.log set -x diff --git a/test/test-remove-lpf b/test/test-remove-lpf index 5bda631..1d8e2e5 100755 --- a/test/test-remove-lpf +++ b/test/test-remove-lpf @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash exec &> test-remove-lpf.log set -x diff --git a/test/test-update-lpf b/test/test-update-lpf index 790efcf..f750bc2 100755 --- a/test/test-update-lpf +++ b/test/test-update-lpf @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash exec 2> test-update-lpf.log set -x diff --git a/test/test_lpf.py b/test/test_lpf.py index 3449ecc..81148a4 100644 --- a/test/test_lpf.py +++ b/test/test_lpf.py @@ -64,7 +64,7 @@ class TestLpf(unittest.TestCase): def test_notify(self): ''' Test notifications i. e., lpf-notify. ''' with open('/dev/null', 'w') as devnull: - subprocess.check_call(['/bin/bash', '-c', './test-notify'], + subprocess.check_call(['/usr/bin/bash', '-c', './test-notify'], stdout=devnull) if __name__ == "__main__": diff --git a/tools/build-lpf-pkg b/tools/build-lpf-pkg index 84f1354..bb14a22 100755 --- a/tools/build-lpf-pkg +++ b/tools/build-lpf-pkg @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash rm -rf rpms; mkdir rpms diff --git a/tools/fix-git-setup b/tools/fix-git-setup index d68c79e..bb2c43f 100755 --- a/tools/fix-git-setup +++ b/tools/fix-git-setup @@ -1,4 +1,4 @@ -#/bin/bash +#/usr/bin/bash # # Setup some version filtering. # diff --git a/tools/make_rpm b/tools/make_rpm index 06ffa35..165c022 100755 --- a/tools/make_rpm +++ b/tools/make_rpm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # lpf: create a fresh rpm to try. # diff --git a/tools/version-clean b/tools/version-clean index 23b3215..26ecf1f 100755 --- a/tools/version-clean +++ b/tools/version-clean @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Version filter, can also be used with file argument. # diff --git a/tools/version-smudge b/tools/version-smudge index eafee44..9fd5ddb 100755 --- a/tools/version-smudge +++ b/tools/version-smudge @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # Version filter, can also be used with file argument. # -- 2.14.4