summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2018-09-10 09:21:27 -0400
committerAmar Tumballi <amarts@redhat.com>2018-09-11 04:25:17 +0000
commit5afff66b254e2c86eee287b5233e5a5305ad0788 (patch)
tree5dc0ca0f0f2d56409313cc85f7979bbab2bb7470
parent0e399b9e4623a68eb681f8c3c5c45e05048a96e8 (diff)
misc: fix misc. shebangs
* One #!/usr/bin/env python and three #!/usr/bin/python were overlooked in all the other python fixups. Ugh. * Two new python files missed the memo about #!/usr/bin/python3. * One #!/usr/bin/env bash. Various distribution packaging policies have strong wording about the use of #!/usr/bin/env ... Note: this patch does not change the use of #!/usr/bin/env bash in the two files extras/{clang-checker.sh,check_goto.pl} as these are not included in any packages. (Although I'm not actually sure why anyone would ever use '/usr/bin/env {sh,bash}' as I'm not aware of any version-specific differences like there are with, e.g., python.) * One #!/usr/bin/bash. On Fedora and CentOS > 6, /bin is a symlink to /usr/bin, so it makes little difference. But Debian & Ubuntu still have separate /bin and /usr/bin; and sh and bash are in /bin, not /usr/bin. (Historically, in BSD and SYSV Unix it was /bin/sh.) Note: Fedora and CentOS package build runs a script that converts all /bin/sh and /bin/bash to /usr/bin/sh and /usr/bin/bash. Change-Id: I9171265829af78dd0cd7622c22b56d22179ff8a3 updates: bz#1193929 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
-rwxr-xr-xextras/quota/log_accounting.sh2
-rwxr-xr-xextras/quota/quota_fsck.py2
-rwxr-xr-xextras/stop-all-gluster-processes.sh2
-rw-r--r--tests/utils/changelogparser.py2
-rw-r--r--xlators/features/cloudsync/src/cloudsync-fops-c.py2
-rw-r--r--xlators/features/cloudsync/src/cloudsync-fops-h.py2
-rw-r--r--xlators/features/utime/src/utime-gen-fops-c.py2
-rw-r--r--xlators/features/utime/src/utime-gen-fops-h.py2
8 files changed, 8 insertions, 8 deletions
diff --git a/extras/quota/log_accounting.sh b/extras/quota/log_accounting.sh
index 9c2381f6a95..e2dd87b84d7 100755
--- a/extras/quota/log_accounting.sh
+++ b/extras/quota/log_accounting.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/bash
+#!/bin/bash
# The script does an accounting of all directories using command 'du' and
# using gluster. We can then compare the two to identify accounting mismatch
# THere can be minor mismatch because gluster only accounts for the size of
diff --git a/extras/quota/quota_fsck.py b/extras/quota/quota_fsck.py
index 2803c6ec7c6..f03895de114 100755
--- a/extras/quota/quota_fsck.py
+++ b/extras/quota/quota_fsck.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# The following script enables, Detecting, Reporting and Fixing
# anomalies in quota accounting. Run this script with -h option
# for further details.
diff --git a/extras/stop-all-gluster-processes.sh b/extras/stop-all-gluster-processes.sh
index ea2b48ee88b..710aaf5fd3c 100755
--- a/extras/stop-all-gluster-processes.sh
+++ b/extras/stop-all-gluster-processes.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
#
# Kill all the processes/services except glusterd
#
diff --git a/tests/utils/changelogparser.py b/tests/utils/changelogparser.py
index e173e52cbe6..e8b8c6d6a6a 100644
--- a/tests/utils/changelogparser.py
+++ b/tests/utils/changelogparser.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
"""
Why?
diff --git a/xlators/features/cloudsync/src/cloudsync-fops-c.py b/xlators/features/cloudsync/src/cloudsync-fops-c.py
index fda56752871..fdaa1432a6c 100644
--- a/xlators/features/cloudsync/src/cloudsync-fops-c.py
+++ b/xlators/features/cloudsync/src/cloudsync-fops-c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from __future__ import print_function
import os
diff --git a/xlators/features/cloudsync/src/cloudsync-fops-h.py b/xlators/features/cloudsync/src/cloudsync-fops-h.py
index 8a97cd0fcdd..faa2de651a7 100644
--- a/xlators/features/cloudsync/src/cloudsync-fops-h.py
+++ b/xlators/features/cloudsync/src/cloudsync-fops-h.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from __future__ import print_function
import os
diff --git a/xlators/features/utime/src/utime-gen-fops-c.py b/xlators/features/utime/src/utime-gen-fops-c.py
index 6ebd1afe9cd..d7f12d18f2b 100644
--- a/xlators/features/utime/src/utime-gen-fops-c.py
+++ b/xlators/features/utime/src/utime-gen-fops-c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from __future__ import print_function
import os
diff --git a/xlators/features/utime/src/utime-gen-fops-h.py b/xlators/features/utime/src/utime-gen-fops-h.py
index e04cbd41293..3686f2e3c1e 100644
--- a/xlators/features/utime/src/utime-gen-fops-h.py
+++ b/xlators/features/utime/src/utime-gen-fops-h.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
from __future__ import print_function
import os