From fcfb501c0e307005cec0439d711f574b847ce1c3 Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 12 Oct 2005 14:30:52 +0000 Subject: - scripts/inspect.in: remove unnecessary path_search() function and let the shell search the path internally. --- po/de.po | 22 +++++++++++----------- po/fr.po | 22 +++++++++++----------- po/ja.po | 22 +++++++++++----------- po/quilt.pot | 22 +++++++++++----------- quilt.changes | 6 ++++++ scripts/inspect.in | 21 ++------------------- 6 files changed, 52 insertions(+), 63 deletions(-) diff --git a/po/de.po b/po/de.po index 8b756ba..ca68eed 100644 --- a/po/de.po +++ b/po/de.po @@ -83,19 +83,19 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Die Datei %s befindet sich unter dem Verzeichnis %s\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 +#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Patch %s ist nicht in der series-Datei enthalten\\n" -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 +#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Patch %s ist nicht angewandt\\n" -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 +#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 #: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 @@ -321,40 +321,40 @@ msgstr "" "--sort\tSortiere Dateien im Patch nach ihrem namen, statt die ursprüngliche\n" "\tReihenfolge zu erhalten.\n" -#: quilt/diff.in:231 +#: quilt/diff.in:232 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Die Optionen \\`--combine', \\`--snapshot', und \\`-z' können nicht " "kombiniert werden.\\n" -#: quilt/diff.in:258 +#: quilt/diff.in:259 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Kann kein Diff mit -p$opt_strip_level erzeugen, bitte -p0 oder -p1 verwenden." "\\n" -#: quilt/diff.in:293 quilt/files.in:122 +#: quilt/diff.in:294 quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Patch %s ist nicht vor Patch %s angewandt\\n" -#: quilt/diff.in:343 quilt/pop.in:101 +#: quilt/diff.in:344 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Konnte Dateien nicht in temporäres Verzeichnis kopieren\\n" -#: quilt/diff.in:367 quilt/pop.in:125 +#: quilt/diff.in:368 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Konnte temporäre Dateien nicht patchen\\n" -#: quilt/diff.in:386 +#: quilt/diff.in:387 msgid "File %s is not being modified\\n" msgstr "Datei %s wird nicht verändert.\\n" -#: quilt/diff.in:406 quilt/refresh.in:201 +#: quilt/diff.in:407 quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Diff fehlgeschlagen, Abbruch.\\n" -#: quilt/diff.in:413 +#: quilt/diff.in:414 msgid "More recent patches modify files in patch %s\\n" msgstr "Später angewandte Patches verändern Dateien von %s\\n" diff --git a/po/fr.po b/po/fr.po index 7b56f82..253bdea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -83,19 +83,19 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "Le fichier %s est situ en dessous de %s\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 +#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "Le patch %s n'est pas dans la srie\\n" -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 +#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "Le patch %s n'est pas appliqu\\n" -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 +#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 #: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 @@ -317,40 +317,40 @@ msgstr "" "--sort\tTrie les fichiers par leur nom au lieu de prserver leur ordre\n" "\td'origine.\n" -#: quilt/diff.in:231 +#: quilt/diff.in:232 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "Les options --combine, --snapshot et -z ne peuvent pas tre combines." "\\n" -#: quilt/diff.in:258 +#: quilt/diff.in:259 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" "Impossible de crer des patches avec -p%s. Veuillez spcifier -p0 ou -p1 " "la place\\n" -#: quilt/diff.in:293 quilt/files.in:122 +#: quilt/diff.in:294 quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "Le patch %s n'est pas appliqu avant %s\\n." -#: quilt/diff.in:343 quilt/pop.in:101 +#: quilt/diff.in:344 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "Impossible de copier les fichiers dans le rpertoire temporaire\\n" -#: quilt/diff.in:367 quilt/pop.in:125 +#: quilt/diff.in:368 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "Impossible de patcher les fichiers temporaires\\n" -#: quilt/diff.in:386 +#: quilt/diff.in:387 msgid "File %s is not being modified\\n" msgstr "Le fichier %s n'est pas modifi.\\n" -#: quilt/diff.in:406 quilt/refresh.in:201 +#: quilt/diff.in:407 quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "Le diff a chou. Abandon.\\n" -#: quilt/diff.in:413 +#: quilt/diff.in:414 msgid "More recent patches modify files in patch %s\\n" msgstr "Un patch plus recent modifie des fichiers communs %s.\\n" diff --git a/po/ja.po b/po/ja.po index fb26eea..e489c62 100644 --- a/po/ja.po +++ b/po/ja.po @@ -81,19 +81,19 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "ファイル \\`%s'は、\\`%s'以下にあります\\n" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 +#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "パッチ %s は seriesの中にありません\\n" -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 +#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "パッチ %s は適用されていません\\n" -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 +#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 #: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 @@ -314,37 +314,37 @@ msgstr "" "\n" "--sort\t順番を保持せず、名前順にファイルを並び換える。\n" -#: quilt/diff.in:231 +#: quilt/diff.in:232 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" "オプション \\`--combine'と \\`--snapshot'、 \\`-z'は同時に使えません。\\n" -#: quilt/diff.in:258 +#: quilt/diff.in:259 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "-p%sでパッチの差分はとれません。-p0か -p1を指定してください\\n" -#: quilt/diff.in:293 quilt/files.in:122 +#: quilt/diff.in:294 quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "パッチ %s は、パッチ %s の前に適用されていません\\n" -#: quilt/diff.in:343 quilt/pop.in:101 +#: quilt/diff.in:344 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "テンポラリディレクトリへのファイルコピーに失敗しました\\n" -#: quilt/diff.in:367 quilt/pop.in:125 +#: quilt/diff.in:368 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "テンポラリファイルへのパッチ適用に失敗しました\\n" -#: quilt/diff.in:386 +#: quilt/diff.in:387 msgid "File %s is not being modified\\n" msgstr "ファイル %s は変更されていません\\n" -#: quilt/diff.in:406 quilt/refresh.in:201 +#: quilt/diff.in:407 quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "差分に失敗しました。異常終了します\\n" -#: quilt/diff.in:413 +#: quilt/diff.in:414 msgid "More recent patches modify files in patch %s\\n" msgstr "最近のパッチが、パッチ %s 内のファイルを変更しています\\n" diff --git a/po/quilt.pot b/po/quilt.pot index b0f5923..e8c1f9a 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -47,19 +47,19 @@ msgid "File \\`%s' is located below \\`%s'\\n" msgstr "" #: quilt/add.in:78 quilt/annotate.in:103 quilt/applied.in:62 -#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:171 quilt/graph.in:116 +#: quilt/delete.in:109 quilt/diff.in:160 quilt/diff.in:172 quilt/graph.in:116 #: quilt/header.in:135 quilt/next.in:62 quilt/pop.in:233 quilt/previous.in:62 #: quilt/push.in:312 quilt/refresh.in:148 quilt/remove.in:53 #: quilt/rename.in:63 quilt/unapplied.in:62 msgid "Patch %s is not in series\\n" msgstr "" -#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:239 quilt/graph.in:121 +#: quilt/add.in:99 quilt/annotate.in:123 quilt/diff.in:240 quilt/graph.in:121 #: quilt/pop.in:248 quilt/refresh.in:154 quilt/remove.in:74 msgid "Patch %s is not applied\\n" msgstr "" -#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:247 quilt/files.in:103 +#: quilt/add.in:106 quilt/delete.in:88 quilt/diff.in:248 quilt/files.in:103 #: quilt/fold.in:79 quilt/fork.in:72 quilt/graph.in:131 quilt/header.in:142 #: quilt/pop.in:282 quilt/push.in:350 quilt/refresh.in:162 quilt/remove.in:81 #: quilt/rename.in:85 @@ -215,36 +215,36 @@ msgid "" "--sort\tSort files by their name instead of preserving the original order.\n" msgstr "" -#: quilt/diff.in:231 +#: quilt/diff.in:232 msgid "" "Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" -#: quilt/diff.in:258 +#: quilt/diff.in:259 msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n" msgstr "" -#: quilt/diff.in:293 quilt/files.in:122 +#: quilt/diff.in:294 quilt/files.in:122 msgid "Patch %s not applied before patch %s\\n" msgstr "" -#: quilt/diff.in:343 quilt/pop.in:101 +#: quilt/diff.in:344 quilt/pop.in:101 msgid "Failed to copy files to temporary directory\\n" msgstr "" -#: quilt/diff.in:367 quilt/pop.in:125 +#: quilt/diff.in:368 quilt/pop.in:125 msgid "Failed to patch temporary files\\n" msgstr "" -#: quilt/diff.in:386 +#: quilt/diff.in:387 msgid "File %s is not being modified\\n" msgstr "" -#: quilt/diff.in:406 quilt/refresh.in:201 +#: quilt/diff.in:407 quilt/refresh.in:201 msgid "Diff failed, aborting\\n" msgstr "" -#: quilt/diff.in:413 +#: quilt/diff.in:414 msgid "More recent patches modify files in patch %s\\n" msgstr "" diff --git a/quilt.changes b/quilt.changes index 0e19ea2..69b9f0c 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 12 15:33:53 CEST 2005 - agruen@suse.de + +- scripts/inspect.in: remove unnecessary path_search() function + and let the shell search the path internally. + ------------------------------------------------------------------- Tue Oct 4 18:43:42 CEST 2005 - khali@linux-fr.org diff --git a/scripts/inspect.in b/scripts/inspect.in index b929b0f..83f2db3 100644 --- a/scripts/inspect.in +++ b/scripts/inspect.in @@ -89,23 +89,6 @@ shopt -u nullglob cat <<-'EOF' > $tmpdir/bin/wrapper #! @BASH@ - # search the path for command $1 - path_search() { - local cmd=$1 dir - IFS=: - set -- $PATH - shift - - for dir in "$@"; do - if [ -x $dir/$cmd ] - then - echo $dir/$cmd - return 0 - fi - done - return 1 - } - # find original data file by md5sum original_file() { local file=$1 md5sum @@ -179,8 +162,8 @@ cat <<-'EOF' > $tmpdir/bin/wrapper esac fi - realcmd="$(path_search ${0##*/})" \ - && $realcmd "$@" < $tmpdir/data + PATH=${PATH#*:} + ${0##*/} "$@" < $tmpdir/data EOF chmod 755 $tmpdir/bin/wrapper ln -s wrapper $tmpdir/bin/patch -- cgit