From c3f0bdb51c0e6b1103c3852ce3f61ac50d6fe1ca Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Mon, 12 Mar 2012 08:59:05 +0100 Subject: [PATCH] Bug 7675 Followup: moving two shell scripts to misc/bin. Content-Type: text/plain; charset="utf-8" Removed two trailings spaces from find-nonutf8 too (line 6 and 31). --- misc/bin/find-misplaced-executables.sh | 38 ++++++++++++++++++++++++++++++++ misc/bin/find-nonutf8.sh | 36 ++++++++++++++++++++++++++++++ xt/find-misplaced-executables | 38 -------------------------------- xt/find-nonutf8 | 36 ------------------------------ 4 files changed, 74 insertions(+), 74 deletions(-) create mode 100755 misc/bin/find-misplaced-executables.sh create mode 100755 misc/bin/find-nonutf8.sh delete mode 100755 xt/find-misplaced-executables delete mode 100755 xt/find-nonutf8 diff --git a/misc/bin/find-misplaced-executables.sh b/misc/bin/find-misplaced-executables.sh new file mode 100755 index 0000000..ebee961 --- /dev/null +++ b/misc/bin/find-misplaced-executables.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# +# Script to find files that probably should not be executed. +# +# Copyright 2010 Catalyst IT Ltd +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +find . \ + -name misc -prune \ + -o -name svc -prune \ + -o -name xt -prune \ + -o -name t -prune \ + -o -name .git -prune \ + -o -name blib -prune \ + -o -name scripts -prune \ + -o -name debian -prune \ + -o -executable -type f \ + '!' -name '*.pl' \ + '!' -name '*.sh' \ + '!' -name '*.plugin' \ + '!' -name unapi \ + -print diff --git a/misc/bin/find-nonutf8.sh b/misc/bin/find-nonutf8.sh new file mode 100755 index 0000000..151dabc --- /dev/null +++ b/misc/bin/find-nonutf8.sh @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Find Koha source files that are not in UTF-8. Non-textual files are ignored. +# This script requires the isutf8 program from Joey Hess's moreutils package. +# See for info. +# +# Copyright 2010 Catalyst IT Ltd +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +git ls-files | +grep -Ev '\.(gif|jpg|png|pdf|ogg|psd|swf|odt|zip|ico|DS_Store|chr|dat)$' | +grep -v /js/tinymce/ | +while read filename +do + if ! isutf8 -q "$filename" + then + echo "$filename" + fi +done + diff --git a/xt/find-misplaced-executables b/xt/find-misplaced-executables deleted file mode 100755 index ebee961..0000000 --- a/xt/find-misplaced-executables +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Script to find files that probably should not be executed. -# -# Copyright 2010 Catalyst IT Ltd -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -e - -find . \ - -name misc -prune \ - -o -name svc -prune \ - -o -name xt -prune \ - -o -name t -prune \ - -o -name .git -prune \ - -o -name blib -prune \ - -o -name scripts -prune \ - -o -name debian -prune \ - -o -executable -type f \ - '!' -name '*.pl' \ - '!' -name '*.sh' \ - '!' -name '*.plugin' \ - '!' -name unapi \ - -print diff --git a/xt/find-nonutf8 b/xt/find-nonutf8 deleted file mode 100755 index a1a56e9..0000000 --- a/xt/find-nonutf8 +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Find Koha source files that are not in UTF-8. Non-textual files are ignored. -# This script requires the isutf8 program from Joey Hess's moreutils package. -# See for info. -# -# Copyright 2010 Catalyst IT Ltd -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# Koha is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with Koha; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -e - -git ls-files | -grep -Ev '\.(gif|jpg|png|pdf|ogg|psd|swf|odt|zip|ico|DS_Store|chr|dat)$' | -grep -v /js/tinymce/ | -while read filename -do - if ! isutf8 -q "$filename" - then - echo "$filename" - fi -done - -- 1.6.0.6