Revert "[needs-qa]Usr bin env"

qgis · Jan 30, 2018 · f37c2bf · f37c2bf
1 parent e5ab743
commit f37c2bf
Show file tree

Hide file tree

Showing 67 changed files with 83 additions and 83 deletions.
diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -2126,9 +2126,9 @@ EXTERNAL_PAGES         = YES
 
 # The PERL_PATH should be the absolute path and name of the perl script
 # interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/env perl.
+# The default file (with absolute path) is: /usr/bin/perl.
 
-PERL_PATH              = /usr/bin/env perl
+PERL_PATH              = /usr/bin/perl
 
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool

diff --git a/external/libdxfrw/libdxfrw.dox b/external/libdxfrw/libdxfrw.dox
@@ -251,7 +251,7 @@ TAGFILES               =
 GENERATE_TAGFILE       =
 ALLEXTERNALS           = NO
 EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/env perl
+PERL_PATH              = /usr/bin/perl
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------

diff --git a/ms-windows/cygwin/package.sh b/ms-windows/cygwin/package.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    package.sh
 #    ---------------------

diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # creates a NSIS installer from OSGeo4W packages
 # note: works also on Unix
 

diff --git a/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    quickpackage.sh
 #    ---------------------

diff --git a/rpm/buildrpms.sh b/rpm/buildrpms.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    buildrpms.sh
 #    ---------------------

diff --git a/scripts/2to3 b/scripts/2to3
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
 import sys, os
 
 from lib2to3.main import main

diff --git a/scripts/addcopyright.sh b/scripts/addcopyright.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    addcopyright.sh
 #    ---------------------
@@ -333,20 +333,20 @@ EOF
 
 	*.bat|*.cmd)
 		cat - $src >$dst <<EOF
-REM ***************************************************************************
-REM    $basename
-REM    ---------------------
-REM    begin                : $authordate
-REM    copyright            : (C) $authoryear by $authorname
-REM    email                : $authoremail
-REM ***************************************************************************
-REM *                                                                         *
-REM *   This program is free software; you can redistribute it and/or modify  *
-REM *   it under the terms of the GNU General Public License as published by  *
-REM *   the Free Software Foundation; either version 2 of the License, or     *
-REM *   (at your option) any later version.                                   *
-REM *                                                                         *
-REM ***************************************************************************
+REM ***************************************************************************
+REM    $basename
+REM    ---------------------
+REM    begin                : $authordate
+REM    copyright            : (C) $authoryear by $authorname
+REM    email                : $authoremail
+REM ***************************************************************************
+REM *                                                                         *
+REM *   This program is free software; you can redistribute it and/or modify  *
+REM *   it under the terms of the GNU General Public License as published by  *
+REM *   the Free Software Foundation; either version 2 of the License, or     *
+REM *   (at your option) any later version.                                   *
+REM *                                                                         *
+REM ***************************************************************************
 EOF
 		;;
 

diff --git a/scripts/addfix.pl b/scripts/addfix.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 use strict;
 use warnings;
 

diff --git a/scripts/astyle-all.sh b/scripts/astyle-all.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    astyle-all.sh
 #    ---------------------

diff --git a/scripts/astyle-rollback.sh b/scripts/astyle-rollback.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    astyle-rollback.sh
 #    ---------------------

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    astyle.sh
 #    ---------------------

diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    build_debian_package.sh
 #    ---------------------

diff --git a/scripts/chkcopyrights.sh b/scripts/chkcopyrights.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    chkcopyrights.sh
 #    ---------------------

diff --git a/scripts/chkdoclink.sh b/scripts/chkdoclink.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    chkdoclink.sh
 #    ---------------------

diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    chkspelling.sh
 #    ---------------------

diff --git a/scripts/chstroke.sh b/scripts/chstroke.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    chstroke.sh
 #    ---------------------

diff --git a/scripts/context_help_id.py b/scripts/context_help_id.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
 """
 /***************************************************************************
                                context_help_id.py
@@ -40,7 +40,7 @@
     hash.update(sys.argv[1])
     # generate the context id by converting the first 12 characters of the hash
     # to decimal
-    context_id = int(hash.hexdigest()[:12], 16)
+    context_id = int(hash.hexdigest()[:12],16)
     # print the result
     print context_id
 else:

diff --git a/scripts/create-transifex-resources.sh b/scripts/create-transifex-resources.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    create-transifex-resources.sh
 #    ---------------------

diff --git a/scripts/customwidget_create.sh b/scripts/customwidget_create.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/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 @@
-#!/usr/bin/env bash
+#!/bin/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/perl
 ###########################################################################
 #    doxygen_space.pl
 #    ---------------------

diff --git a/scripts/fixdiff.pl b/scripts/fixdiff.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl 
+#!/usr/bin/perl 
 ###########################################################################
 #    fixdiff.pl
 #    ---------------------

diff --git a/scripts/integrate_function_help.pl b/scripts/integrate_function_help.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 use strict;
 use warnings;

diff --git a/scripts/jenkins-run.sh b/scripts/jenkins-run.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 if [ -d build ]
 then

diff --git a/scripts/listpulls.pl b/scripts/listpulls.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 use strict;
 use warnings;

diff --git a/scripts/make-tarball.sh b/scripts/make-tarball.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    make-tarball.sh
 #    ---------------------

diff --git a/scripts/make_gource_video.sh b/scripts/make_gource_video.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    make_gource_video.sh
 #    ---------------------

diff --git a/scripts/processing2cpp.pl b/scripts/processing2cpp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    processing2cpp.pl
 #    ---------------------

diff --git a/scripts/pull_ts.sh b/scripts/pull_ts.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    pull_ts.sh
 #    ---------------------

diff --git a/scripts/push_ts.sh b/scripts/push_ts.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    push_ts.sh
 #    ---------------------

diff --git a/scripts/qgm2cpp.pl b/scripts/qgm2cpp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    qgm2cpp.pl
 #    ---------------------

diff --git a/scripts/qgsloggermig.pl b/scripts/qgsloggermig.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    qgsloggermig.pl
 #    ---------------------

diff --git a/scripts/random_vector.py b/scripts/random_vector.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 # Generates random shapefile which may be used for benchmarks
 

diff --git a/scripts/redirects.pl b/scripts/redirects.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl -i.bak -p
+#!/usr/bin/perl -i.bak -p
 
 s%www.qgis.org%qgis.org%g;
 

diff --git a/scripts/release.pl b/scripts/release.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # creates a new release
 
 # Copyright (C) 2014 Jürgen E. Fischer <jef@norbit.de>

diff --git a/scripts/remove_non_svn_files.sh b/scripts/remove_non_svn_files.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    remove_non_svn_files.sh
 #    ---------------------

diff --git a/scripts/remove_temporary_files.sh b/scripts/remove_temporary_files.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    remove_git_confict_files.sh
 #    ---------------------

diff --git a/scripts/rename_class.sh b/scripts/rename_class.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # 
 

diff --git a/scripts/replace-console-i18n.pl b/scripts/replace-console-i18n.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 
 use strict;
 use warnings;

diff --git a/scripts/replacev2.sh b/scripts/replacev2.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 set -e
 

diff --git a/scripts/scandeps.pl b/scripts/scandeps.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    scandeps.pl
 #    ---------------------

diff --git a/scripts/sipify.pl b/scripts/sipify.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 use strict;
 use warnings;
 use File::Basename;

diff --git a/scripts/sort_include.sh b/scripts/sort_include.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    sort_include.sh
 #    ---------------------

diff --git a/scripts/spell_check/spell_test.sh b/scripts/spell_check/spell_test.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
 

diff --git a/scripts/symbol_xml2db.py b/scripts/symbol_xml2db.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python
 """
 /***************************************************************************
                                symbol_xml2db.py

diff --git a/scripts/ts2cpp.pl b/scripts/ts2cpp.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    ts2cpp.pl
 #    ---------------------

diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 ###########################################################################
 #    tsstat.pl
 #    ---------------------

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/perl -i.sortinc -n
 ###########################################################################
 #    unify_includes.pl
 #    ---------------------

diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    update-indent.sh
 #    ---------------------

diff --git a/scripts/update-news.pl b/scripts/update-news.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/env perl
+#!/usr/bin/perl
 # updates the news file from changelog.qgis.org
 
 # Copyright (C) 2016 Jürgen E. Fischer <jef@norbit.de>

diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    update_ts.sh
 #    ---------------------

diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 ###########################################################################
 #    update_ts_files.sh
 #    ---------------------

diff --git a/scripts/verify-indentation.sh b/scripts/verify-indentation.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 cd $(git rev-parse --show-toplevel)
 
 export PATH=$PATH:$PWD/scripts

diff --git a/scripts/widgets_tree.py b/scripts/widgets_tree.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 """

diff --git a/src/plugins/grass/modules/resize_grass b/src/plugins/grass/modules/resize_grass
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 # Use a simple shell loop, to process each of the images.
 mkdir thumbnails
 #  for $a in *.png

diff --git a/src/plugins/grass/qgis_grass_test.py b/src/plugins/grass/qgis_grass_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -----------------------------------------------------------
 #