fix perl;add bash

lbartoletti · lbartoletti · commit be8b9113c25f · 2017-08-07T15:09:03.000-04:00
diff --git a/ms-windows/cygwin/package.sh b/ms-windows/cygwin/package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    package.sh
 #    ---------------------
diff --git a/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    quickpackage.sh
 #    ---------------------
diff --git a/scripts/addcopyright.sh b/scripts/addcopyright.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    addcopyright.sh
 #    ---------------------
diff --git a/scripts/astyle-all.sh b/scripts/astyle-all.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    astyle-all.sh
 #    ---------------------
diff --git a/scripts/astyle-rollback.sh b/scripts/astyle-rollback.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    astyle-rollback.sh
 #    ---------------------
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    astyle.sh
 #    ---------------------
@@ -64,8 +64,8 @@ astyleit() {
 	$ASTYLE --options="$ASTYLEOPTS" "$1"
 	modified=$1.unify_includes_modified
 	cp "$1" "$modified"
-	scripts/unify_includes.pl "$modified"
-	scripts/doxygen_space.pl "$modified"
+	perl scripts/unify_includes.pl -i.sortinc -n "$modified"
+	perl scripts/doxygen_space.pl -0 -i.sortinc -n "$modified"
 	diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
 	rm -f "$modified"
 }
diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    build_debian_package.sh
 #    ---------------------
diff --git a/scripts/chkcopyrights.sh b/scripts/chkcopyrights.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    chkcopyrights.sh
 #    ---------------------
diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    chkspelling.sh
 #    ---------------------
diff --git a/scripts/chstroke.sh b/scripts/chstroke.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    chstroke.sh
 #    ---------------------
diff --git a/scripts/create-transifex-resources.sh b/scripts/create-transifex-resources.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    create-transifex-resources.sh
 #    ---------------------
diff --git a/scripts/customwidget_create.sh b/scripts/customwidget_create.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script automatically creates custom widget plugin for a given widget class name.
 # Use customwidget_create.sh QgsColorButton to create QgsColorButtonPlugin files.
diff --git a/scripts/dbdiff.sh b/scripts/dbdiff.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ "$1" = "-h" ]; then
 	echo "usage: $0 [-h] [database] [sha1] [sha2]"
diff --git a/scripts/doxygen_space.pl b/scripts/doxygen_space.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -0 -i.sortinc -n
+#!/usr/bin/env perl
 ###########################################################################
 #    doxygen_space.pl
 #    ---------------------
diff --git a/scripts/jenkins-run.sh b/scripts/jenkins-run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -d build ]
 then
diff --git a/scripts/make-tarball.sh b/scripts/make-tarball.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    make-tarball.sh
 #    ---------------------
diff --git a/scripts/make_gource_video.sh b/scripts/make_gource_video.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    make_gource_video.sh
 #    ---------------------
diff --git a/scripts/pull_ts.sh b/scripts/pull_ts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    pull_ts.sh
 #    ---------------------
diff --git a/scripts/push_ts.sh b/scripts/push_ts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    push_ts.sh
 #    ---------------------
diff --git a/scripts/remove_non_svn_files.sh b/scripts/remove_non_svn_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    remove_non_svn_files.sh
 #    ---------------------
diff --git a/scripts/remove_temporary_files.sh b/scripts/remove_temporary_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    remove_git_confict_files.sh
 #    ---------------------
diff --git a/scripts/rename_class.sh b/scripts/rename_class.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # 
 
diff --git a/scripts/replacev2.sh b/scripts/replacev2.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
diff --git a/scripts/sort_include.sh b/scripts/sort_include.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    sort_include.sh
 #    ---------------------
diff --git a/scripts/spell_check/spell_test.sh b/scripts/spell_check/spell_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 
diff --git a/scripts/unify_includes.pl b/scripts/unify_includes.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -i.sortinc -n
+#!/usr/bin/env perl
 ###########################################################################
 #    unify_includes.pl
 #    ---------------------
diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    update-indent.sh
 #    ---------------------
diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    update_ts.sh
 #    ---------------------
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###########################################################################
 #    update_ts_files.sh
 #    ---------------------
diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 cd $(git rev-parse --show-toplevel)
 
 export PATH=$PATH:$PWD/scripts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/bash`
	`1`	`+#!/usr/bin/env bash`
`2`	`2`	`###########################################################################`
`3`	`3`	`# package.sh`
`4`	`4`	`# ---------------------`