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