From 124e26815daca2c31850b39ce93998336eea11bd Mon Sep 17 00:00:00 2001 From: lbartoletti Date: Mon, 5 Feb 2018 13:38:02 +0100 Subject: [PATCH] Standardize shebangs (was Usr bin env) (#6229) * Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} * fix perl;add bash * Fix indentation using modified scripts * Revert "fix perl;add bash" This reverts commit be8b9113c25f7c2fb9c8c9bad556fbca2f0c0ba2. * python3 everywhere * more bash * rebase change perl * Linux perl; missing from last PR * fix doxygen_space * Use portable /usr/bin/env/{perl,python} instead of /usr/bin/{perl,python} * fix perl;add bash * Fix indentation using modified scripts * Revert "fix perl;add bash" This reverts commit be8b9113c25f7c2fb9c8c9bad556fbca2f0c0ba2. * python3 everywhere * more bash * rebase change perl * fix doxygen_space --- cmake_templates/Doxyfile.in | 4 +-- external/libdxfrw/libdxfrw.dox | 2 +- ms-windows/cygwin/package.sh | 2 +- ms-windows/osgeo4w/creatensis.pl | 2 +- ms-windows/quickpackage.sh | 2 +- rpm/buildrpms.sh | 2 +- scripts/2to3 | 2 +- scripts/addcopyright.sh | 30 +++++++++---------- scripts/addfix.pl | 2 +- scripts/astyle-all.sh | 2 +- scripts/astyle-rollback.sh | 2 +- scripts/astyle.sh | 6 ++-- scripts/build_debian_package.sh | 2 +- scripts/chkcopyrights.sh | 2 +- scripts/chkdoclink.sh | 2 +- scripts/chkspelling.sh | 2 +- scripts/chstroke.sh | 2 +- scripts/context_help_id.py | 4 +-- scripts/create-transifex-resources.sh | 2 +- scripts/customwidget_create.sh | 2 +- scripts/dbdiff.sh | 2 +- scripts/doxygen_space.pl | 2 +- scripts/fixdiff.pl | 2 +- scripts/integrate_function_help.pl | 2 +- scripts/jenkins-run.sh | 2 +- scripts/listpulls.pl | 2 +- scripts/make-tarball.sh | 2 +- scripts/make_gource_video.sh | 2 +- scripts/processing2cpp.pl | 2 +- scripts/pull_ts.sh | 2 +- scripts/push_ts.sh | 2 +- scripts/qgm2cpp.pl | 2 +- scripts/qgsloggermig.pl | 2 +- scripts/random_vector.py | 2 +- scripts/redirects.pl | 2 +- scripts/release.pl | 2 +- scripts/remove_non_svn_files.sh | 2 +- scripts/remove_temporary_files.sh | 2 +- scripts/rename_class.sh | 2 +- scripts/replace-console-i18n.pl | 2 +- scripts/replacev2.sh | 2 +- scripts/scandeps.pl | 2 +- scripts/sipify.pl | 2 +- scripts/sort_include.sh | 2 +- scripts/spell_check/spell_test.sh | 2 +- scripts/symbol_xml2db.py | 2 +- scripts/ts2cpp.pl | 2 +- scripts/tsstat.pl | 2 +- scripts/unify_includes.pl | 2 +- scripts/update-indent.sh | 2 +- scripts/update-news.pl | 2 +- scripts/update_ts.sh | 2 +- scripts/update_ts_files.sh | 2 +- scripts/verify-indentation.sh | 2 +- scripts/widgets_tree.py | 2 +- src/plugins/grass/modules/resize_grass | 2 +- src/plugins/grass/qgis_grass_test.py | 2 +- .../grass/scripts/db.connect-login.pg.py | 2 +- .../grass/scripts/qgis.v.kernel.rast.py | 2 +- src/plugins/grass/scripts/qgis.v.upgrade.py | 2 +- src/plugins/grass/scripts/r.external.all.py | 2 +- src/plugins/grass/scripts/t.rast.what.qgis.py | 2 +- .../grass/scripts/v.class.mlpy.qgis.py | 2 +- src/plugins/grass/scripts/v.out.ogr.pg.py | 2 +- src/plugins/plugin_builder.py | 2 +- .../fcgi/scripts/spawn_fcgi_mac.sh | 2 +- .../lighttpd/scripts/lighttpd_mac.sh | 2 +- 67 files changed, 85 insertions(+), 85 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/external/libdxfrw/libdxfrw.dox b/external/libdxfrw/libdxfrw.dox index 3484ce4d9ba..c939f8a7942 100644 --- 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/perl +PERL_PATH = /usr/bin/env perl #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- diff --git a/ms-windows/cygwin/package.sh b/ms-windows/cygwin/package.sh index 87333b65570..7fbbdaa9e3b 100644 --- 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/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl index cc25161b804..fc2edbc448f 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/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh index dd65f095e44..a146c1fa12a 100755 --- 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/rpm/buildrpms.sh b/rpm/buildrpms.sh index c23787299d2..11675763deb 100755 --- a/rpm/buildrpms.sh +++ b/rpm/buildrpms.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # buildrpms.sh # --------------------- diff --git a/scripts/2to3 b/scripts/2to3 index 91788c9bbc4..01b6d9c9944 100755 --- a/scripts/2to3 +++ b/scripts/2to3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import sys, os from lib2to3.main import main diff --git a/scripts/addcopyright.sh b/scripts/addcopyright.sh index 8149dc8cf35..4761b89474e 100755 --- a/scripts/addcopyright.sh +++ b/scripts/addcopyright.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # addcopyright.sh # --------------------- @@ -333,20 +333,20 @@ EOF *.bat|*.cmd) cat - $src >$dst </dev/null || mv "$modified" "$1" rm -f "$modified" diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh index 60cfb947663..9da1f219827 100755 --- 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 index d54a10261b4..ba1c42fbc2d 100755 --- a/scripts/chkcopyrights.sh +++ b/scripts/chkcopyrights.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # chkcopyrights.sh # --------------------- diff --git a/scripts/chkdoclink.sh b/scripts/chkdoclink.sh index 835c8e3ce02..fbae0e6bd5b 100755 --- a/scripts/chkdoclink.sh +++ b/scripts/chkdoclink.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # chkdoclink.sh # --------------------- diff --git a/scripts/chkspelling.sh b/scripts/chkspelling.sh index 5b8cd79a0a7..dc0e74f7178 100755 --- 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 index 2c7f66b0d65..719ca35ed75 100755 --- a/scripts/chstroke.sh +++ b/scripts/chstroke.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ########################################################################### # chstroke.sh # --------------------- diff --git a/scripts/context_help_id.py b/scripts/context_help_id.py index 2487288caf5..771ab2b615d 100755 --- a/scripts/context_help_id.py +++ b/scripts/context_help_id.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 """ /*************************************************************************** context_help_id.py @@ -40,7 +40,7 @@ if len(sys.argv) > 1: 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 index ab0969bcf52..c01cac15469 100755 --- 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 index f613d68bb61..bcec4b615d0 100755 --- 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 index 391108c453b..58c6701f839 100644 --- 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 index ec41c87129c..68d14f67314 100755 --- a/scripts/doxygen_space.pl +++ b/scripts/doxygen_space.pl @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl ########################################################################### # 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/jenkins-run.sh b/scripts/jenkins-run.sh index e29409fe9ec..255d4c847e9 100755 --- 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/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/make-tarball.sh b/scripts/make-tarball.sh index 411558202aa..69587b2dd1d 100755 --- 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 index 2454ceeee79..c8515102ba6 100644 --- 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/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/pull_ts.sh b/scripts/pull_ts.sh index 2bcce596400..f5dd85fdbc5 100755 --- 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 index dd0a9460a44..86ad551e700 100755 --- 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/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/random_vector.py b/scripts/random_vector.py index 4a61e2b9c41..f0a3e459cb5 100755 --- a/scripts/random_vector.py +++ b/scripts/random_vector.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Generates random shapefile which may be used for benchmarks 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 4a104c09068..22a4b7a6bdf 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/remove_non_svn_files.sh b/scripts/remove_non_svn_files.sh index 8df666e8da3..1c99fb7042d 100644 --- 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 index 535cccec2e8..d5c3502c87d 100755 --- 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 index 8b3920b4e87..2535b73b160 100755 --- a/scripts/rename_class.sh +++ b/scripts/rename_class.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # 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/replacev2.sh b/scripts/replacev2.sh index 7971e2b4b3e..5213bb650cd 100755 --- a/scripts/replacev2.sh +++ b/scripts/replacev2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/scripts/scandeps.pl b/scripts/scandeps.pl index b2379b1f328..e3b5341a871 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 1364fbf73f7..c6ebc152b0a 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/sort_include.sh b/scripts/sort_include.sh index fec7a8a39ad..994f0bca38e 100755 --- 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 index 0b7004717d9..7b94e0e0a94 100755 --- 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/symbol_xml2db.py b/scripts/symbol_xml2db.py index 72876b47313..ea48968eeec 100644 --- a/scripts/symbol_xml2db.py +++ b/scripts/symbol_xml2db.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 """ /*************************************************************************** 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 6e89f4f7a39..aa88f7baf08 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..da6ed70e1e3 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 ########################################################################### # unify_includes.pl # --------------------- diff --git a/scripts/update-indent.sh b/scripts/update-indent.sh index 9c8effc668c..ad9c583e0c2 100644 --- 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-news.pl b/scripts/update-news.pl index c2db5365126..7c9906f13da 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/scripts/update_ts.sh b/scripts/update_ts.sh index 811fb29ba9e..8114ebc9b5b 100755 --- 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 index a1b91183fa5..a215d0e133b 100755 --- 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 index b44d4e4baae..44a89eda09e 100755 --- 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 diff --git a/scripts/widgets_tree.py b/scripts/widgets_tree.py index e03d725a712..486768042f4 100644 --- a/scripts/widgets_tree.py +++ b/scripts/widgets_tree.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/grass/modules/resize_grass b/src/plugins/grass/modules/resize_grass index f1846052149..7779c99214b 100644 --- a/src/plugins/grass/modules/resize_grass +++ b/src/plugins/grass/modules/resize_grass @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 index 392821830d0..d1803e43d31 100755 --- a/src/plugins/grass/qgis_grass_test.py +++ b/src/plugins/grass/qgis_grass_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # ----------------------------------------------------------- # diff --git a/src/plugins/grass/scripts/db.connect-login.pg.py b/src/plugins/grass/scripts/db.connect-login.pg.py index 536914f0b9b..e8a990cf599 100644 --- a/src/plugins/grass/scripts/db.connect-login.pg.py +++ b/src/plugins/grass/scripts/db.connect-login.pg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/grass/scripts/qgis.v.kernel.rast.py b/src/plugins/grass/scripts/qgis.v.kernel.rast.py index 7e5cfeeebf1..db9071485f5 100644 --- a/src/plugins/grass/scripts/qgis.v.kernel.rast.py +++ b/src/plugins/grass/scripts/qgis.v.kernel.rast.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/grass/scripts/qgis.v.upgrade.py b/src/plugins/grass/scripts/qgis.v.upgrade.py index de72c3ac2e2..5fe2dfca38f 100644 --- a/src/plugins/grass/scripts/qgis.v.upgrade.py +++ b/src/plugins/grass/scripts/qgis.v.upgrade.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/grass/scripts/r.external.all.py b/src/plugins/grass/scripts/r.external.all.py index b9c2482a683..9c534a278ce 100644 --- a/src/plugins/grass/scripts/r.external.all.py +++ b/src/plugins/grass/scripts/r.external.all.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/grass/scripts/t.rast.what.qgis.py b/src/plugins/grass/scripts/t.rast.what.qgis.py index 656eeaa7d3c..1b0beba20cc 100644 --- a/src/plugins/grass/scripts/t.rast.what.qgis.py +++ b/src/plugins/grass/scripts/t.rast.what.qgis.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- ############################################################################ # diff --git a/src/plugins/grass/scripts/v.class.mlpy.qgis.py b/src/plugins/grass/scripts/v.class.mlpy.qgis.py index 0d2e2b80607..1c8ac022005 100644 --- a/src/plugins/grass/scripts/v.class.mlpy.qgis.py +++ b/src/plugins/grass/scripts/v.class.mlpy.qgis.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- ############################################################################ # diff --git a/src/plugins/grass/scripts/v.out.ogr.pg.py b/src/plugins/grass/scripts/v.out.ogr.pg.py index 3b95aa1a4a1..2e99e5afa6c 100644 --- a/src/plugins/grass/scripts/v.out.ogr.pg.py +++ b/src/plugins/grass/scripts/v.out.ogr.pg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """ diff --git a/src/plugins/plugin_builder.py b/src/plugins/plugin_builder.py index 1570b6bb11d..6543d68c392 100755 --- a/src/plugins/plugin_builder.py +++ b/src/plugins/plugin_builder.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 """ *************************************************************************** plugin_builder.py diff --git a/tests/testdata/qgis_local_server/fcgi/scripts/spawn_fcgi_mac.sh b/tests/testdata/qgis_local_server/fcgi/scripts/spawn_fcgi_mac.sh index be148b6f775..0d1fcce3585 100755 --- a/tests/testdata/qgis_local_server/fcgi/scripts/spawn_fcgi_mac.sh +++ b/tests/testdata/qgis_local_server/fcgi/scripts/spawn_fcgi_mac.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/usr/bin/env bash ########################################################################### # spawn_fcgi_mac.sh # --------------------- diff --git a/tests/testdata/qgis_local_server/lighttpd/scripts/lighttpd_mac.sh b/tests/testdata/qgis_local_server/lighttpd/scripts/lighttpd_mac.sh index 7d578294935..a047e76ec44 100755 --- a/tests/testdata/qgis_local_server/lighttpd/scripts/lighttpd_mac.sh +++ b/tests/testdata/qgis_local_server/lighttpd/scripts/lighttpd_mac.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#!/usr/bin/env bash ########################################################################### # lighttpd_mac.sh # ---------------------