Skip to content

Commit 85d543a

Browse files
committed
Rename scripts to swap "-" for "_" for consistency
We had a confusing and unpredictable mix of script names with - vs _, e.g. scripts/prepare-commit.sh vs scripts/sipify_all.sh This unifies with the preferred _ convention for script file names
1 parent 3656b10 commit 85d543a

23 files changed

+25
-25
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ Proper formatting
99
Before making a pull request, please make sure your code is properly formatted
1010
by running the prepare commit script **before** issuing `git commit`.
1111

12-
./scripts/prepare-commit.sh
12+
./scripts/prepare_commit.sh
1313

1414
This can be automated by setting up the pre-commit hook properly.
1515

16-
ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit
16+
ln -s ../../scripts/prepare_commit.sh .git/hooks/pre-commit
1717

1818
Getting your pull request merged
1919
--------------------------------

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
2828
- New unit tests have been added for relevant changes
2929
30-
- You have run the `scripts/prepare-commit.sh` script (https://github.com/qgis/QGIS/blob/master/.github/CONTRIBUTING.md#contributing-to-qgis) before each commit.
31-
If you didn't do this, you can also run `./scripts/astyle-all.sh` from your source folder.
30+
- You have run the `scripts/prepare_commit.sh` script (https://github.com/qgis/QGIS/blob/master/.github/CONTRIBUTING.md#contributing-to-qgis) before each commit.
31+
If you didn't do this, you can also run `./scripts/astyle_all.sh` from your source folder.
3232
3333
- You have read the QGIS Coding Standards (https://docs.qgis.org/testing/en/docs/developers_guide/codingstandards.html) and this PR complies with them
3434
-->

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ ENDIF(WITH_CORE)
489489
SET(CMAKE_AUTOMOC ON)
490490

491491
# build our version of astyle
492-
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
492+
SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare_commit.sh (using 'our' astyle)")
493493

494494
# QML
495495
SET(QML_IMPORT_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" CACHE PATH "QML directory for QML autocomplete")

cmake/PyQtMacros.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ ENDIF(NOT PYUIC_PROGRAM)
2727
MACRO(PYQT_WRAP_UI outfiles )
2828
IF(CMAKE_HOST_WIN32)
2929
IF(USING_NINJA OR USING_NMAKE)
30-
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.bat")
30+
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.bat")
3131
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin")
3232
ELSE(USING_NINJA OR USING_NMAKE)
33-
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.bat")
33+
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.bat")
3434
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/bin/${CMAKE_BUILD_TYPE}")
3535
ENDIF(USING_NINJA OR USING_NMAKE)
3636
ELSE(CMAKE_HOST_WIN32)
3737
# TODO osx
38-
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
38+
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
3939
SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
4040
ENDIF(CMAKE_HOST_WIN32)
4141

editors/link_precommit.sh

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

3-
ln -sf ../../scripts/prepare-commit.sh .git/hooks/pre-commit
3+
ln -sf ../../scripts/prepare_commit.sh .git/hooks/pre-commit

rpm/sources/qgis-lib64.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
44
@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
55
ELSE(CMAKE_HOST_WIN32)
66
# TODO osx
7-
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic-wrapper.sh")
7+
SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
88
- SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
99
+ SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
1010
ENDIF(CMAKE_HOST_WIN32)
File renamed without changes.
File renamed without changes.

scripts/create-transifex-resources.sh renamed to scripts/create_transifex_resources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
###########################################################################
3-
# create-transifex-resources.sh
3+
# create_transifex_resources.sh
44
# ---------------------
55
# Date : March 2013
66
# Copyright : (C) 2013 by Tim Sutton
File renamed without changes.

scripts/prepare-commit.sh renamed to scripts/prepare_commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
###########################################################################
3-
# prepare-commit.sh
3+
# prepare_commit.sh
44
# ---------------------
55
# Date : August 2008
66
# Copyright : (C) 2008 by Juergen E. Fischer

scripts/pyuic-wrapper.bat renamed to scripts/pyuic_wrapper.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set PYUIC=%1
33
set PATH=%2;%PATH%
44
set PYTHONPATH=%3;%PYTHONPATH%
55
set PYTHON=%4
6-
%PYTHON% %~dp0\pyuic-wrapper.py %5 %6 %7 %8 %9
6+
%PYTHON% %~dp0\pyuic_wrapper.py %5 %6 %7 %8 %9

scripts/pyuic-wrapper.py renamed to scripts/pyuic_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
***************************************************************************
5-
pyuic-wrapper.py
5+
pyuic_wrapper.py
66
---------------------
77
Date : March 2016
88
Copyright : (C) 2016 by Juergen E. Fischer

scripts/pyuic-wrapper.sh renamed to scripts/pyuic_wrapper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
###########################################################################
3-
# pyuic-wrapper.sh
3+
# pyuic_wrapper.sh
44
# ---------------------
55
# Date : March 2016
66
# Copyright : (C) 2016 by Juergen E. Fischer
@@ -22,4 +22,4 @@ shift 4
2222

2323
export LD_LIBRARY_PATH PYTHONPATH
2424

25-
exec $PYTHON $(dirname $0)/pyuic-wrapper.py "$@"
25+
exec $PYTHON $(dirname $0)/pyuic_wrapper.py "$@"

scripts/release.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ ($$)
164164
run( "perl -i -pe 's#<releases>#<releases>\n <release version=\"$newmajor.$newminor.$newpatch\" date=\"" . strftime("%Y-%m-%d", localtime) . "\" />#' linux/org.qgis.qgis.appdata.xml.in", "appdata update failed" );
165165

166166
unless( $dopoint ) {
167-
run( "scripts/update-news.pl $newmajor.$newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
167+
run( "scripts/update_news.pl $newmajor.$newminor '$newreleasename'", "could not update news" ) if $major>2 || ($major==2 && $minor>14);
168168

169169
run( "git commit -n -a -m \"changelog and news update for $release\"", "could not commit changelog and news update" );
170170

File renamed without changes.

scripts/ts-clear.pl renamed to scripts/ts_clear.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env perl
22
###########################################################################
3-
# ts-clear.pl
3+
# ts_clear.pl
44
# ---------------------
55
# begin : October 2018
66
# copyright : (C) 2018 by Juergen E. Fischer

scripts/update-indent.sh renamed to scripts/update_indent.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
###########################################################################
3-
# update-indent.sh
3+
# update_indent.sh
44
# ---------------------
55
# Date : August 2008
66
# Copyright : (C) 2008 by Juergen E. Fischer

scripts/update-news.pl renamed to scripts/update_news.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@
6666

6767
=head1 NAME
6868
69-
update-news.pl - updates the news file from changelog.qgis.org
69+
update_news.pl - updates the news file from changelog.qgis.org
7070
7171
=head1 SYNOPSIS
7272
73-
update-news.pl version releasename
73+
update_news.pl version releasename
7474
7575
=cut

scripts/update_ts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ if [ $action = push ]; then
126126
exit 1
127127
fi
128128
cp i18n/qgis_en.ts /tmp/qgis_en.ts-downloaded
129-
perl scripts/ts-clear.pl # reset English translations
129+
perl scripts/ts_clear.pl # reset English translations
130130
elif [ $action = pull ]; then
131131
rm -f i18n/qgis_*.ts
132132

scripts/verify-indentation.sh renamed to scripts/verify_indentation.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Tips to prevent and resolve:
6565
* Enable WITH_ASTYLE in your cmake configuration to format C++ code
6666
* Install autopep8 (>= 1.2.1) to format python code
6767
* Use "scripts/astyle.sh file" to fix the now badly indented files
68-
* Consider using scripts/prepare-commit.sh as pre-commit hook to avoid this
69-
in the future (ln -s ../../scripts/prepare-commit.sh .git/hooks/pre-commit) or
68+
* Consider using scripts/prepare_commit.sh as pre-commit hook to avoid this
69+
in the future (ln -s ../../scripts/prepare_commit.sh .git/hooks/pre-commit) or
7070
run it manually before each commit.
7171
EOF
7272

tests/code_layout/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
IF(WITH_ASTYLE)
2-
ADD_TEST(qgis_indentation ${CMAKE_SOURCE_DIR}/scripts/verify-indentation.sh)
2+
ADD_TEST(qgis_indentation ${CMAKE_SOURCE_DIR}/scripts/verify_indentation.sh)
33
ENDIF(WITH_ASTYLE)
44

55
ADD_TEST(qgis_banned_keywords ${CMAKE_SOURCE_DIR}/tests/code_layout/test_banned_keywords.sh)

0 commit comments

Comments
 (0)