From 6b67a720da37303ce3e803649cd8a7699da2429e Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Mon, 7 Aug 2017 19:54:52 +0200 Subject: [PATCH] Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} --- cmake_templates/Doxyfile.in | 4 ++-- ms-windows/osgeo4w/creatensis.pl | 2 +- scripts/2to3 | 2 +- scripts/addfix.pl | 2 +- scripts/context_help_id.py | 2 +- scripts/doxygen_space.pl | 2 +- scripts/fixdiff.pl | 2 +- scripts/integrate_function_help.pl | 2 +- scripts/listpulls.pl | 2 +- scripts/processing2cpp.pl | 2 +- scripts/qgm2cpp.pl | 2 +- scripts/qgsloggermig.pl | 2 +- scripts/redirects.pl | 2 +- scripts/release.pl | 2 +- scripts/replace-console-i18n.pl | 2 +- scripts/scandeps.pl | 2 +- scripts/sipify.pl | 2 +- scripts/symbol_xml2db.py | 2 +- scripts/ts2cpp.pl | 2 +- scripts/tsstat.pl | 2 +- scripts/unify_includes.pl | 2 +- scripts/update-news.pl | 2 +- src/app/dwg/libdxfrw/libdxfrw.dox | 2 +- src/plugins/plugin_builder.py | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in index 7135b6cf4da..23fac38e026 100644 --- 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/perl. +# The default file (with absolute path) is: /usr/bin/env perl. -PERL_PATH = /usr/bin/perl +PERL_PATH = /usr/bin/env perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl index ef2107db55c..d6aa3a5b494 100755 --- a/ms-windows/osgeo4w/creatensis.pl +++ b/ms-windows/osgeo4w/creatensis.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # creates a NSIS installer from OSGeo4W packages # note: works also on Unix diff --git a/scripts/2to3 b/scripts/2to3 index 91788c9bbc4..ddab3dfad7b 100755 --- a/scripts/2to3 +++ b/scripts/2to3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os from lib2to3.main import main diff --git a/scripts/addfix.pl b/scripts/addfix.pl index c45faac4447..2b374bb3fc7 100644 --- a/scripts/addfix.pl +++ b/scripts/addfix.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/scripts/context_help_id.py b/scripts/context_help_id.py index 2487288caf5..6ad638f515e 100755 --- a/scripts/context_help_id.py +++ b/scripts/context_help_id.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ /*************************************************************************** context_help_id.py diff --git a/scripts/doxygen_space.pl b/scripts/doxygen_space.pl index be43bad42c3..fe28eb38141 100755 --- a/scripts/doxygen_space.pl +++ b/scripts/doxygen_space.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -0 -i.sortinc -n +#!/usr/bin/env perl -0 -i.sortinc -n ########################################################################### # doxygen_space.pl # --------------------- diff --git a/scripts/fixdiff.pl b/scripts/fixdiff.pl index ef3d68f286b..069fb565215 100644 --- a/scripts/fixdiff.pl +++ b/scripts/fixdiff.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # fixdiff.pl # --------------------- diff --git a/scripts/integrate_function_help.pl b/scripts/integrate_function_help.pl index 6f971c2b704..39b95e96e28 100755 --- a/scripts/integrate_function_help.pl +++ b/scripts/integrate_function_help.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/scripts/listpulls.pl b/scripts/listpulls.pl index fbc1edb300e..39f4b78d3c1 100644 --- a/scripts/listpulls.pl +++ b/scripts/listpulls.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/scripts/processing2cpp.pl b/scripts/processing2cpp.pl index baf3ece1971..f00af53e5a5 100644 --- a/scripts/processing2cpp.pl +++ b/scripts/processing2cpp.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # processing2cpp.pl # --------------------- diff --git a/scripts/qgm2cpp.pl b/scripts/qgm2cpp.pl index 3c2b0ef1e90..ced98039475 100644 --- a/scripts/qgm2cpp.pl +++ b/scripts/qgm2cpp.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # qgm2cpp.pl # --------------------- diff --git a/scripts/qgsloggermig.pl b/scripts/qgsloggermig.pl index 27101234b7f..4083abafa84 100644 --- a/scripts/qgsloggermig.pl +++ b/scripts/qgsloggermig.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # qgsloggermig.pl # --------------------- diff --git a/scripts/redirects.pl b/scripts/redirects.pl index f783a757270..14b62eb45d1 100755 --- a/scripts/redirects.pl +++ b/scripts/redirects.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -i.bak -p +#!/usr/bin/env perl -i.bak -p s%www.qgis.org%qgis.org%g; diff --git a/scripts/release.pl b/scripts/release.pl index 534d07f7c8a..168d9f4d5f7 100755 --- a/scripts/release.pl +++ b/scripts/release.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # creates a new release # Copyright (C) 2014 Jürgen E. Fischer diff --git a/scripts/replace-console-i18n.pl b/scripts/replace-console-i18n.pl index 60e73831ee7..66be487e88a 100644 --- a/scripts/replace-console-i18n.pl +++ b/scripts/replace-console-i18n.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/scripts/scandeps.pl b/scripts/scandeps.pl index 7da14bec3d4..ec14ff1311a 100755 --- a/scripts/scandeps.pl +++ b/scripts/scandeps.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # scandeps.pl # --------------------- diff --git a/scripts/sipify.pl b/scripts/sipify.pl index 3bdea4ee9ed..2f4c2fffa68 100755 --- a/scripts/sipify.pl +++ b/scripts/sipify.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; use File::Basename; diff --git a/scripts/symbol_xml2db.py b/scripts/symbol_xml2db.py index 72876b47313..3df2f2ce75e 100644 --- a/scripts/symbol_xml2db.py +++ b/scripts/symbol_xml2db.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ /*************************************************************************** symbol_xml2db.py diff --git a/scripts/ts2cpp.pl b/scripts/ts2cpp.pl index d181a488b98..d55943b830c 100644 --- a/scripts/ts2cpp.pl +++ b/scripts/ts2cpp.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # ts2cpp.pl # --------------------- diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl index a0889c0303f..6c3dc193186 100755 --- a/scripts/tsstat.pl +++ b/scripts/tsstat.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # tsstat.pl # --------------------- diff --git a/scripts/unify_includes.pl b/scripts/unify_includes.pl index 4364a1f2ab0..d876d248bbb 100755 --- a/scripts/unify_includes.pl +++ b/scripts/unify_includes.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl -i.sortinc -n +#!/usr/bin/env perl -i.sortinc -n ########################################################################### # unify_includes.pl # --------------------- diff --git a/scripts/update-news.pl b/scripts/update-news.pl index 9cbf41c1a2e..b6a7aba42b7 100755 --- a/scripts/update-news.pl +++ b/scripts/update-news.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl # updates the news file from changelog.qgis.org # Copyright (C) 2016 Jürgen E. Fischer diff --git a/src/app/dwg/libdxfrw/libdxfrw.dox b/src/app/dwg/libdxfrw/libdxfrw.dox index 3484ce4d9ba..c939f8a7942 100644 --- a/src/app/dwg/libdxfrw/libdxfrw.dox +++ b/src/app/dwg/libdxfrw/libdxfrw.dox @@ -251,7 +251,7 @@ TAGFILES = GENERATE_TAGFILE = ALLEXTERNALS = NO EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl +PERL_PATH = /usr/bin/env perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/src/plugins/plugin_builder.py b/src/plugins/plugin_builder.py index 1570b6bb11d..f67aa4b7353 100755 --- a/src/plugins/plugin_builder.py +++ b/src/plugins/plugin_builder.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python """ *************************************************************************** plugin_builder.py