Skip to content

Commit 8564422

Browse files
authored
Merge pull request #6072 from lbartoletti/usr_bin_env
[needs-qa]Usr bin env
2 parents 998c67d + 1ce7dba commit 8564422

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+83
-83
lines changed

cmake_templates/Doxyfile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2126,9 +2126,9 @@ EXTERNAL_PAGES = YES
21262126

21272127
# The PERL_PATH should be the absolute path and name of the perl script
21282128
# interpreter (i.e. the result of 'which perl').
2129-
# The default file (with absolute path) is: /usr/bin/perl.
2129+
# The default file (with absolute path) is: /usr/bin/env perl.
21302130

2131-
PERL_PATH = /usr/bin/perl
2131+
PERL_PATH = /usr/bin/env perl
21322132

21332133
#---------------------------------------------------------------------------
21342134
# Configuration options related to the dot tool

external/libdxfrw/libdxfrw.dox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ TAGFILES =
251251
GENERATE_TAGFILE =
252252
ALLEXTERNALS = NO
253253
EXTERNAL_GROUPS = YES
254-
PERL_PATH = /usr/bin/perl
254+
PERL_PATH = /usr/bin/env perl
255255
#---------------------------------------------------------------------------
256256
# Configuration options related to the dot tool
257257
#---------------------------------------------------------------------------

ms-windows/cygwin/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# package.sh
44
# ---------------------

ms-windows/osgeo4w/creatensis.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
# creates a NSIS installer from OSGeo4W packages
33
# note: works also on Unix
44

ms-windows/quickpackage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# quickpackage.sh
44
# ---------------------

rpm/buildrpms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# buildrpms.sh
44
# ---------------------

scripts/2to3

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python3
22
import sys, os
33

44
from lib2to3.main import main

scripts/addcopyright.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# addcopyright.sh
44
# ---------------------
@@ -333,20 +333,20 @@ EOF
333333

334334
*.bat|*.cmd)
335335
cat - $src >$dst <<EOF
336-
REM ***************************************************************************
337-
REM $basename
338-
REM ---------------------
339-
REM begin : $authordate
340-
REM copyright : (C) $authoryear by $authorname
341-
REM email : $authoremail
342-
REM ***************************************************************************
343-
REM * *
344-
REM * This program is free software; you can redistribute it and/or modify *
345-
REM * it under the terms of the GNU General Public License as published by *
346-
REM * the Free Software Foundation; either version 2 of the License, or *
347-
REM * (at your option) any later version. *
348-
REM * *
349-
REM ***************************************************************************
336+
REM ***************************************************************************
337+
REM $basename
338+
REM ---------------------
339+
REM begin : $authordate
340+
REM copyright : (C) $authoryear by $authorname
341+
REM email : $authoremail
342+
REM ***************************************************************************
343+
REM * *
344+
REM * This program is free software; you can redistribute it and/or modify *
345+
REM * it under the terms of the GNU General Public License as published by *
346+
REM * the Free Software Foundation; either version 2 of the License, or *
347+
REM * (at your option) any later version. *
348+
REM * *
349+
REM ***************************************************************************
350350
EOF
351351
;;
352352

scripts/addfix.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
use strict;
33
use warnings;
44

scripts/astyle-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# astyle-all.sh
44
# ---------------------

scripts/astyle-rollback.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# astyle-rollback.sh
44
# ---------------------

scripts/astyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# astyle.sh
44
# ---------------------

scripts/build_debian_package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# build_debian_package.sh
44
# ---------------------

scripts/chkcopyrights.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# chkcopyrights.sh
44
# ---------------------

scripts/chkdoclink.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# chkdoclink.sh
44
# ---------------------

scripts/chkspelling.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# chkspelling.sh
44
# ---------------------

scripts/chstroke.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# chstroke.sh
44
# ---------------------

scripts/context_help_id.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python3
22
"""
33
/***************************************************************************
44
context_help_id.py
@@ -40,7 +40,7 @@
4040
hash.update(sys.argv[1])
4141
# generate the context id by converting the first 12 characters of the hash
4242
# to decimal
43-
context_id = int(hash.hexdigest()[:12],16)
43+
context_id = int(hash.hexdigest()[:12], 16)
4444
# print the result
4545
print context_id
4646
else:

scripts/create-transifex-resources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# create-transifex-resources.sh
44
# ---------------------

scripts/customwidget_create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
# This script automatically creates custom widget plugin for a given widget class name.
44
# Use customwidget_create.sh QgsColorButton to create QgsColorButtonPlugin files.

scripts/dbdiff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
if [ "$1" = "-h" ]; then
44
echo "usage: $0 [-h] [database] [sha1] [sha2]"

scripts/doxygen_space.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl -0 -i.sortinc -n
22
###########################################################################
33
# doxygen_space.pl
44
# ---------------------

scripts/fixdiff.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# fixdiff.pl
44
# ---------------------

scripts/integrate_function_help.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22

33
use strict;
44
use warnings;

scripts/jenkins-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
if [ -d build ]
44
then

scripts/listpulls.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22

33
use strict;
44
use warnings;

scripts/make-tarball.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# make-tarball.sh
44
# ---------------------

scripts/make_gource_video.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# make_gource_video.sh
44
# ---------------------

scripts/processing2cpp.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# processing2cpp.pl
44
# ---------------------

scripts/pull_ts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# pull_ts.sh
44
# ---------------------

scripts/push_ts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# push_ts.sh
44
# ---------------------

scripts/qgm2cpp.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# qgm2cpp.pl
44
# ---------------------

scripts/qgsloggermig.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# qgsloggermig.pl
44
# ---------------------

scripts/random_vector.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22

33
# Generates random shapefile which may be used for benchmarks
44

scripts/redirects.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl -i.bak -p
1+
#!/usr/bin/env perl -i.bak -p
22

33
s%www.qgis.org%qgis.org%g;
44

scripts/release.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
# creates a new release
33

44
# Copyright (C) 2014 Jürgen E. Fischer <jef@norbit.de>

scripts/remove_non_svn_files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# remove_non_svn_files.sh
44
# ---------------------

scripts/remove_temporary_files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# remove_git_confict_files.sh
44
# ---------------------

scripts/rename_class.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
#
44

scripts/replace-console-i18n.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22

33
use strict;
44
use warnings;

scripts/replacev2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

33
set -e
44

scripts/scandeps.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# scandeps.pl
44
# ---------------------

scripts/sipify.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
use strict;
33
use warnings;
44
use File::Basename;

scripts/sort_include.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# sort_include.sh
44
# ---------------------

scripts/spell_check/spell_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
set -e
33

44

scripts/symbol_xml2db.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python
1+
#!/usr/bin/env python3
22
"""
33
/***************************************************************************
44
symbol_xml2db.py

scripts/ts2cpp.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# ts2cpp.pl
44
# ---------------------

scripts/tsstat.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
###########################################################################
33
# tsstat.pl
44
# ---------------------

scripts/unify_includes.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl -i.sortinc -n
1+
#!/usr/bin/env perl -i.sortinc -n
22
###########################################################################
33
# unify_includes.pl
44
# ---------------------

scripts/update-indent.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# update-indent.sh
44
# ---------------------

scripts/update-news.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/perl
1+
#!/usr/bin/env perl
22
# updates the news file from changelog.qgis.org
33

44
# Copyright (C) 2016 Jürgen E. Fischer <jef@norbit.de>

scripts/update_ts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# update_ts.sh
44
# ---------------------

scripts/update_ts_files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
###########################################################################
33
# update_ts_files.sh
44
# ---------------------

scripts/verify-indentation.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
cd $(git rev-parse --show-toplevel)
33

44
export PATH=$PATH:$PWD/scripts

scripts/widgets_tree.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

44
"""

src/plugins/grass/modules/resize_grass

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22
# Use a simple shell loop, to process each of the images.
33
mkdir thumbnails
44
# for $a in *.png

src/plugins/grass/qgis_grass_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33
# -----------------------------------------------------------
44
#

0 commit comments

Comments
 (0)