Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'usr_bin_env' of https://github.com/lbartoletti/QGIS int…
…o usr_bin_env
  • Loading branch information
lbartoletti committed Jan 15, 2018
2 parents 7064704 + 61c7047 commit f2a0c77
Show file tree
Hide file tree
Showing 52 changed files with 55 additions and 55 deletions.
4 changes: 2 additions & 2 deletions cmake_templates/Doxyfile.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ms-windows/cygwin/package.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# package.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion 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

Expand Down
2 changes: 1 addition & 1 deletion ms-windows/quickpackage.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# quickpackage.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/2to3
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
import sys, os

from lib2to3.main import main
Expand Down
2 changes: 1 addition & 1 deletion scripts/addcopyright.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# addcopyright.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/addfix.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
use strict;
use warnings;

Expand Down
2 changes: 1 addition & 1 deletion scripts/astyle-all.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# astyle-all.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/astyle-rollback.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# astyle-rollback.sh
# ---------------------
Expand Down
6 changes: 3 additions & 3 deletions scripts/astyle.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# astyle.sh
# ---------------------
Expand Down Expand Up @@ -77,8 +77,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"
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_debian_package.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# build_debian_package.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/chkcopyrights.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# chkcopyrights.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/chkspelling.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# chkspelling.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/chstroke.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# chstroke.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/context_help_id.py
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
"""
/***************************************************************************
context_help_id.py
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-transifex-resources.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# create-transifex-resources.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion 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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/dbdiff.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

if [ "$1" = "-h" ]; then
echo "usage: $0 [-h] [database] [sha1] [sha2]"
Expand Down
2 changes: 1 addition & 1 deletion scripts/doxygen_space.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# doxygen_space.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/fixdiff.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# fixdiff.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/integrate_function_help.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion scripts/jenkins-run.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

if [ -d build ]
then
Expand Down
2 changes: 1 addition & 1 deletion scripts/listpulls.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion scripts/make-tarball.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# make-tarball.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/make_gource_video.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# make_gource_video.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/processing2cpp.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# processing2cpp.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/pull_ts.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# pull_ts.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/push_ts.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# push_ts.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/qgm2cpp.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# qgm2cpp.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/qgsloggermig.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# qgsloggermig.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion 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;

Expand Down
2 changes: 1 addition & 1 deletion 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 <jef@norbit.de>
Expand Down
2 changes: 1 addition & 1 deletion scripts/remove_non_svn_files.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# remove_non_svn_files.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/remove_temporary_files.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# remove_git_confict_files.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/rename_class.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

#

Expand Down
2 changes: 1 addition & 1 deletion scripts/replace-console-i18n.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl

use strict;
use warnings;
Expand Down
2 changes: 1 addition & 1 deletion scripts/replacev2.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -e

Expand Down
2 changes: 1 addition & 1 deletion scripts/scandeps.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# scandeps.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/sipify.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
use strict;
use warnings;
use File::Basename;
Expand Down
2 changes: 1 addition & 1 deletion scripts/sort_include.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# sort_include.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/spell_check/spell_test.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e


Expand Down
2 changes: 1 addition & 1 deletion scripts/symbol_xml2db.py
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
"""
/***************************************************************************
symbol_xml2db.py
Expand Down
2 changes: 1 addition & 1 deletion scripts/ts2cpp.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# ts2cpp.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/tsstat.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl
#!/usr/bin/env perl
###########################################################################
# tsstat.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/unify_includes.pl
@@ -1,4 +1,4 @@
#!/usr/bin/perl -i.sortinc -n
#!/usr/bin/env perl
###########################################################################
# unify_includes.pl
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-indent.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# update-indent.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion 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 <jef@norbit.de>
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_ts.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# update_ts.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/update_ts_files.sh
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
###########################################################################
# update_ts_files.sh
# ---------------------
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion src/app/dwg/libdxfrw/libdxfrw.dox
Expand Up @@ -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
#---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/plugin_builder.py
@@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/env python
"""
***************************************************************************
plugin_builder.py
Expand Down

0 comments on commit f2a0c77

Please sign in to comment.