diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-14 04:27:21 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-14 04:27:21 +0000 |
| commit | 64f092c0a46b3d592db231947b930e9c1a5aa524 (patch) | |
| tree | f02a492015d7201ca9bfc98f347e816df034e54e | |
| parent | c31c2b03f9cb66981908c9048eb586d2917856af (diff) | |
| download | quilt-64f092c0a46b3d592db231947b930e9c1a5aa524.tar.gz | |
- Use the quilt version in the source tree instead of the
installed version for running the test suite.
39 files changed, 158 insertions, 136 deletions
diff --git a/Makefile.in b/Makefile.in index dc861bf..56719f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -123,6 +123,8 @@ SRC += $(wildcard test/*.test) test/run test/Makefile \ test/test.quiltrc SRC += changes2changelog +NON_EXEC_IN := doc/quilt.1 doc/README scripts/patchfns + #----------------------------------------------------------------------- all : scripts compat-programs $(if $(MSGFMT),$(LINGUAS:%=po/%.mo)) @@ -268,6 +270,7 @@ $(patsubst %.in,%,$(wildcard quilt/*.in scripts/*.in)) :: Makefile -e 's:@LOCALEDIR''@:$(localedir):g' \ -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \ $< > $@ + @$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@) lib/backup-files.o :: Makefile diff --git a/bin/quilt.in b/bin/quilt.in index 55d0f32..2db6d21 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -9,6 +9,9 @@ export TEXTDOMAIN=quilt export TEXTDOMAINDIR=@LOCALEDIR@ +: ${QUILT=@QUILT@} ${LIB=@LIB@} +export QUILT LIB + if [ -z "$QUILTRC" ] then for QUILTRC in $HOME/.quiltrc /etc/quilt.quiltrc; do @@ -18,9 +21,9 @@ then fi # Support compatibility layer -if [ -d @QUILT@/compat ] +if [ -d $QUILT/compat ] then - export PATH="@QUILT@/compat:$PATH" + export PATH="$QUILT/compat:$PATH" fi usage() @@ -53,11 +56,11 @@ Global options: quilt_commands() { local command - for command in @QUILT@/* + for command in $QUILT/* do if [ -f "$command" -a -x "$command" ] then - echo ${command##@QUILT@/} + echo ${command##$QUILT/} fi done } @@ -105,7 +108,7 @@ do shift done -if ! [ -f "@QUILT@/$command" -a -x "@QUILT@/$command" ] +if ! [ -f "$QUILT/$command" -a -x "$QUILT/$command" ] then if [ -n "$command" ] then @@ -137,4 +140,4 @@ set -- "${args[@]}" unset args export QUILT_COMMAND="${command##*/}" -bash $BASH_OPTS -c ". @QUILT@/$command" "quilt ${command##*/}" "$@" +bash $BASH_OPTS -c ". $QUILT/$command" "quilt ${command##*/}" "$@" @@ -14,19 +14,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10\n" -#: bin/quilt.in:29 +#: bin/quilt.in:32 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..." -#: bin/quilt.in:30 +#: bin/quilt.in:33 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:32 +#: bin/quilt.in:35 msgid "Commands are:" msgstr "Vorhandene Befehle:" -#: bin/quilt.in:37 +#: bin/quilt.in:40 msgid "" "\n" "Global options:\n" @@ -13,19 +13,19 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: bin/quilt.in:29 +#: bin/quilt.in:32 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-h] ..." -#: bin/quilt.in:30 +#: bin/quilt.in:33 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:32 +#: bin/quilt.in:35 msgid "Commands are:" msgstr "Les commandes sont :" -#: bin/quilt.in:37 +#: bin/quilt.in:40 msgid "" "\n" "Global options:\n" @@ -12,19 +12,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: bin/quilt.in:29 +#: bin/quilt.in:32 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." -#: bin/quilt.in:30 +#: bin/quilt.in:33 msgid " quilt --version" msgstr " quilt --version" -#: bin/quilt.in:32 +#: bin/quilt.in:35 msgid "Commands are:" msgstr "コマンド一覧:" -#: bin/quilt.in:37 +#: bin/quilt.in:40 msgid "" "\n" "Global options:\n" diff --git a/po/quilt.pot b/po/quilt.pot index ca44b9b..ca1ec8d 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -1,16 +1,16 @@ -#: bin/quilt.in:29 +#: bin/quilt.in:32 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..." msgstr "" -#: bin/quilt.in:30 +#: bin/quilt.in:33 msgid " quilt --version" msgstr "" -#: bin/quilt.in:32 +#: bin/quilt.in:35 msgid "Commands are:" msgstr "" -#: bin/quilt.in:37 +#: bin/quilt.in:40 msgid "" "\n" "Global options:\n" diff --git a/quilt.changes b/quilt.changes index b5680a4..60c2e8f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Jan 14 05:10:01 CET 2006 - agruen@suse.de + +- Use the quilt version in the source tree instead of the + installed version for running the test suite. + +------------------------------------------------------------------- Tue Jan 10 19:29:57 CET 2006 - khali@linux-fr.org - test/null-bug.test: Fix the original directory creation so that diff --git a/quilt/add.in b/quilt/add.in index f1080db..42a3f8f 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -139,7 +139,7 @@ do continue fi - if ! @LIB@/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file + if ! $LIB/backup-files -b -s -L -B $QUILT_PC/$patch/ $SUBDIR$file then printf $"Failed to back up file %s\n" "$SUBDIR$file" >&2 status=1 diff --git a/quilt/annotate.in b/quilt/annotate.in index c1917e4..466da1b 100644 --- a/quilt/annotate.in +++ b/quilt/annotate.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/applied.in b/quilt/applied.in index 54ec8bd..55c5b5c 100644 --- a/quilt/applied.in +++ b/quilt/applied.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/delete.in b/quilt/delete.in index 1b787e5..2b18930 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/diff.in b/quilt/diff.in index 27c2503..6c4056d 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi setup_colors diff --git a/quilt/edit.in b/quilt/edit.in index 4480f7f..ff20c38 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -11,12 +11,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/files.in b/quilt/files.in index f57a4aa..67872ab 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/fold.in b/quilt/fold.in index 0d6da2c..9a91a26 100644 --- a/quilt/fold.in +++ b/quilt/fold.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/fork.in b/quilt/fork.in index 0db3242..e600ee1 100644 --- a/quilt/fork.in +++ b/quilt/fork.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/graph.in b/quilt/graph.in index 6ae87d4..719e176 100644 --- a/quilt/graph.in +++ b/quilt/graph.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -143,7 +143,7 @@ pipe= [ -n "$opt_format" ] && pipe="| dot -T$opt_format" applied_patches \ -| eval @SCRIPTS@/dependency-graph $options - $pipe +| eval $QUILT/scripts/dependency-graph $options - $pipe ### Local Variables: ### mode: shell-script ### End: diff --git a/quilt/grep.in b/quilt/grep.in index de583d0..7b90d8b 100644 --- a/quilt/grep.in +++ b/quilt/grep.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/header.in b/quilt/header.in index 72e4bc6..0b041c2 100644 --- a/quilt/header.in +++ b/quilt/header.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi : ${EDITOR:=vi} diff --git a/quilt/import.in b/quilt/import.in index c840c78..9ea6cda 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/mail.in b/quilt/mail.in index 8277a9c..4026261 100644 --- a/quilt/mail.in +++ b/quilt/mail.in @@ -11,12 +11,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -65,14 +65,14 @@ process_mail() local tmpfile=$(gen_tempfile) cat > $tmpfile - set -- $(@SCRIPTS@/edmail --charset $opt_charset \ + set -- $($QUILT/scripts/edmail --charset $opt_charset \ --extract-recipients To \ --extract-recipients Cc \ --extract-recipients Bcc \ < $tmpfile) if [ -n "$opt_send" ]; then echo sendmail ${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@" - @SCRIPTS@/edmail --charset $opt_charset \ + $QUILT/scripts/edmail --charset $opt_charset \ --remove-header Bcc "$@" < $tmpfile \ | sendmail ${QUILT_SENDMAIL_ARGS--f "$opt_sender"} "$@" else @@ -186,7 +186,7 @@ introduction=$(gen_tempfile) -- EOF [ -r $HOME/.signature ] && cat $HOME/.signature -) | @SCRIPTS@/edmail --charset $opt_charset > $introduction +) | $QUILT/scripts/edmail --charset $opt_charset > $introduction $EDITOR $introduction || exit 1 @@ -207,7 +207,7 @@ p=${p//@total@/$total} sed -e $'s/^\\(Subject:[ \t]\\)/\\1'"$p"'/' \ -e '/^Subject-Prefix:/d' \ $introduction \ -| @SCRIPTS@/edmail --charset $opt_charset \ +| $QUILT/scripts/edmail --charset $opt_charset \ --remove-empty-headers To Cc Bcc \ | process_mail @@ -263,13 +263,13 @@ for patch in "$@"; do ' $body echo -e '\n--' [ -r $HOME/.signature ] && cat $HOME/.signature - ) | eval @SCRIPTS@/edmail --charset $opt_charset \ + ) | eval $QUILT/scripts/edmail --charset $opt_charset \ --replace-header Date="\"$new_date\"" \ To Cc Bcc \ $modify \ | sed -e $'s/^\\(Subject:[ \t]\\)/\\1'"$p"'/' \ -e '/^Subject-Prefix:/d' \ - | @SCRIPTS@/edmail --remove-empty-headers \ + | $QUILT/scripts/edmail --remove-empty-headers \ | process_mail if [ ${PIPESTATUS[1]} -ne 0 ]; then diff --git a/quilt/new.in b/quilt/new.in index f35f8d2..178775d 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/next.in b/quilt/next.in index fba7637..de8c6e6 100644 --- a/quilt/next.in +++ b/quilt/next.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/patches.in b/quilt/patches.in index 94e8ee5..16e3fa6 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/pop.in b/quilt/pop.in index 5fa7d19..a509e7a 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -170,7 +170,7 @@ remove_patch() status=0 else printf $"Removing patch %s\n" "$(print_patch $patch)" - @LIB@/backup-files $silent -r -t -B $QUILT_PC/$patch/ - + $LIB/backup-files $silent -r -t -B $QUILT_PC/$patch/ - status=$? fi remove_from_db $patch @@ -285,7 +285,7 @@ else # of one: This will automatically be the case in the usual # situations, but we don't want to risk file corruption in weird # corner cases such as files added to a patch but not modified. - @LIB@/backup-files -L -s -B $QUILT_PC/$patch/ - + $LIB/backup-files -L -s -B $QUILT_PC/$patch/ - printf $"Now at patch %s\n" "$(print_patch $patch)" fi ### Local Variables: diff --git a/quilt/previous.in b/quilt/previous.in index ba0080b..ed44465 100644 --- a/quilt/previous.in +++ b/quilt/previous.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/push.in b/quilt/push.in index d8bb245..8eeb588 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi setup_colors @@ -119,7 +119,7 @@ rollback_patch() { local patch=$1 - @LIB@/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ - + $LIB/backup-files $silent_unless_verbose -r -B $QUILT_PC/$patch/ - } cleanup_patch_output() { diff --git a/quilt/refresh.in b/quilt/refresh.in index 8ae63c0..36c9688 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -223,12 +223,12 @@ fi # Check for trailing whitespace if [ -z "$opt_strip_whitespace" ] then - @SCRIPTS@/remove-trailing-ws -n -p$opt_strip_level \ + $QUILT/scripts/remove-trailing-ws -n -p$opt_strip_level \ < $tmp_patch else tmp_patch2=$(gen_tempfile) - if @SCRIPTS@/remove-trailing-ws -p$opt_strip_level \ - < $tmp_patch > $tmp_patch2 + if $QUILT/scripts/remove-trailing-ws -p$opt_strip_level \ + < $tmp_patch > $tmp_patch2 then rm -f $tmp_patch tmp_patch=$tmp_patch2 diff --git a/quilt/remove.in b/quilt/remove.in index e7d2d71..082a476 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -104,7 +104,7 @@ do fi # Restore file from backup - if ! @LIB@/backup-files -r -t -s -B $QUILT_PC/$patch/ $SUBDIR$file + if ! $LIB/backup-files -r -t -s -B $QUILT_PC/$patch/ $SUBDIR$file then printf $"Failed to remove file %s from patch %s\n" \ "$SUBDIR$file" "$(print_patch $patch)" >&2 diff --git a/quilt/rename.in b/quilt/rename.in index 4153eef..88f967d 100644 --- a/quilt/rename.in +++ b/quilt/rename.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/series.in b/quilt/series.in index 5f2f39b..0e23b6c 100644 --- a/quilt/series.in +++ b/quilt/series.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/setup.in b/quilt/setup.in index ef8e6d1..d8847da 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns if [ -n "$SUBDIR" ] then cd $SUBDIR @@ -113,7 +113,7 @@ case "$1" in *.spec) spec_file="$1" - if ! @SCRIPTS@/inspect $verbose "$spec_file" 2>&1 > $tmpfile + if ! $QUILT/scripts/inspect $verbose "$spec_file" 2>&1 > $tmpfile then printf $"The %%prep section of %s failed; results may be incomplete\n" "$spec_file" if [ -z "$verbose" ] diff --git a/quilt/snapshot.in b/quilt/snapshot.in index 2056267..0139af6 100644 --- a/quilt/snapshot.in +++ b/quilt/snapshot.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() @@ -85,7 +85,7 @@ done \ } { print } ' \ -| @LIB@/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/" +| $LIB/backup-files -b -s -L -f - -B "$QUILT_PC/$snap_subdir/" ### Local Variables: ### mode: shell-script diff --git a/quilt/top.in b/quilt/top.in index 9a4b9a7..f70d2a2 100644 --- a/quilt/top.in +++ b/quilt/top.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/unapplied.in b/quilt/unapplied.in index 92cb323..357ed82 100644 --- a/quilt/unapplied.in +++ b/quilt/unapplied.in @@ -9,12 +9,12 @@ # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/quilt/upgrade.in b/quilt/upgrade.in index 9a12610..ec1da32 100644 --- a/quilt/upgrade.in +++ b/quilt/upgrade.in @@ -12,12 +12,12 @@ skip_version_check=1 # Read in library functions if [ "$(type -t patch_file_name)" != function ] then - if ! [ -r @SCRIPTS@/patchfns ] + if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi - . @SCRIPTS@/patchfns + . $QUILT/scripts/patchfns fi usage() diff --git a/scripts/inspect.in b/scripts/inspect.in index 5de5009..c789894 100644 --- a/scripts/inspect.in +++ b/scripts/inspect.in @@ -6,12 +6,14 @@ # # See the COPYING and AUTHORS files for more details. -if ! [ -r @SCRIPTS@/patchfns ] +: ${LIB=@LIB@} ${QUILT=@QUILT@} + +if ! [ -r $QUILT/scripts/patchfns ] then - echo "Cannot read library @SCRIPTS@/patchfns" >&2 + echo "Cannot read library $QUILT/scripts/patchfns" >&2 exit 1 fi -. @SCRIPTS@/patchfns +. $QUILT/scripts/patchfns cd ${SUBDIR:-.} usage() { diff --git a/scripts/patchfns.in b/scripts/patchfns.in index b74cce5..5e29da6 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -24,9 +24,9 @@ DB_VERSION=2 : ${QUILT_PC:=.pc} # Support compatibility layer -if [ -d @QUILT@/compat ] +if [ -d $QUILT/compat ] then - export PATH="@QUILT@/compat:$PATH" + export PATH="$QUILT/compat:$PATH" fi unset CDPATH @@ -729,7 +729,7 @@ quilt_command () local command=$1 shift - QUILT_COMMAND="" bash $BASH_OPTS -c ". @QUILT@/$command" "quilt $command" "$@" + QUILT_COMMAND="" bash $BASH_OPTS -c ". $QUILT/$command" "quilt $command" "$@" } # diff --git a/test/Makefile b/test/Makefile index 96f7aa8..9ec75d3 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,18 +1,26 @@ TESTS=$(shell ls -tr *.test) QUILTRC=$(CURDIR)/test.quiltrc -export QUILTRC +QUILT=$(CURDIR)/../quilt +LIB=$(CURDIR)/../lib +export QUILTRC QUILT LIB +PATH:=$(CURDIR)/../bin:$(PATH) ifneq ($(shell . $(QUILTRC) ; echo $$QUILT_PATCHES_PREFIX),) P=patches/ _P=../patches/ export P _P endif -$(warning P=$(P)) -all: $(TESTS) +all: $(TESTS) remove_symlink .PHONY: $(TESTS) -$(TESTS): +$(TESTS): scripts_symlink @echo "[$@]" @LANG=POSIX ./run $@ + +scripts_symlink: + @[ -e ../quilt/scripts ] || ln -s ../scripts ../quilt/scripts + +remove_symlink: + @rm -f quilt/scripts |