Move licensecheck to external folder

qgis · Jun 4, 2018 · 4bb572f · 4bb572f
1 parent 4e0845b
commit 4bb572f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/code_layout/licensecheck.pl → external/licensecheck/licensecheck.pl b/tests/code_layout/licensecheck.pl → external/licensecheck/licensecheck.pl
diff --git a/tests/code_layout/test_licenses.sh b/tests/code_layout/test_licenses.sh
@@ -3,14 +3,14 @@
 # This test checks that all source files correctly have license headers
 
 INCLUDE_EXTENSIONS="h|cpp|hpp|py|c"
-EXCLUDE_LIST="(.*\/(qtermwidget)\/|ui_defaults\\.h|CREDITS|TODO|README|URI|^[^.]*$|.*\\.(?!($INCLUDE_EXTENSIONS)$))"
+EXCLUDE_LIST="(.*\\/(qtermwidget)\\/|ui_defaults\\.h|CREDITS|TODO|README|URI|^[^.]*$|.*\\.(?!($INCLUDE_EXTENSIONS)$))"
 
 DIR=$(git rev-parse --show-toplevel)
 
-pushd ${DIR} > /dev/null
+pushd "${DIR}" || exit > /dev/null
-missing=$(! { tests/code_layout/licensecheck.pl -r -i "$EXCLUDE_LIST" src & licensecheck -r -i "$EXCLUDE_LIST" python; } | grep UNKNOWN)
+missing=$(! { external/licensecheck/licensecheck.pl -r -i "$EXCLUDE_LIST" src & licensecheck -r -i "$EXCLUDE_LIST" python; } | grep UNKNOWN)
 
-popd > /dev/null
+popd || exit > /dev/null
 
 if [[ $missing ]]; then
   echo " *** Found source files without valid license headers"