diff mbox series

[09/15] remote-mediawiki tests: use "$dir/" instead of "$dir."

Message ID 20200916102918.29805-10-avarab@gmail.com
State New
Headers show
Series remote-mediawiki: various fixes to make tests pass | expand

Commit Message

Ævar Arnfjörð Bjarmason Sept. 16, 2020, 10:29 a.m. UTC
Change UI messages to use "$dir/" instead of "$dir.". I think this is
less confusing.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 contrib/mw-to-git/t/test-gitmw-lib.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff King Sept. 16, 2020, 6:43 p.m. UTC | #1
On Wed, Sep 16, 2020 at 12:29:12PM +0200, Ævar Arnfjörð Bjarmason wrote:

> Change UI messages to use "$dir/" instead of "$dir.". I think this is
> less confusing.

Yeah, a trailing slash is a nice indicator. In the first message,
though:

> -		echo "$MW_FILENAME downloaded in $(pwd). "\
> +		echo "$MW_FILENAME downloaded in $(pwd)/ "\
>  			"You can delete it later if you want."

...we've lost the period separating the two sentences. So you get:

  foo downloaded in /some/path/  You can delete it later if you want.

(the two spaces are because "echo" adds an extra space between the
arguments). Maybe:

  foo downloaded in /some/path/; you can delete it later if you want.

or something?

-Peff
Junio C Hamano Sept. 16, 2020, 9:15 p.m. UTC | #2
Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> Change UI messages to use "$dir/" instead of "$dir.". I think this is
> less confusing.
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>  contrib/mw-to-git/t/test-gitmw-lib.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
> index a466be8f3f..aa04ebfd0f 100755
> --- a/contrib/mw-to-git/t/test-gitmw-lib.sh
> +++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
> @@ -343,10 +343,10 @@ wiki_install () {
>  			"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
>  			"$MW_FILENAME. "\
>  			"Please fix your connection and launch the script again."
> -		echo "$MW_FILENAME downloaded in $(pwd). "\
> +		echo "$MW_FILENAME downloaded in $(pwd)/ "\
>  			"You can delete it later if you want."

"$(pwd)/." to keep the full-stop of the first sentence?

>  	else
> -		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
> +		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)/"
>  	fi
>  	archive_abs_path=$(pwd)/$MW_FILENAME
>  	cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||
diff mbox series

Patch

diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index a466be8f3f..aa04ebfd0f 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -343,10 +343,10 @@  wiki_install () {
 			"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
 			"$MW_FILENAME. "\
 			"Please fix your connection and launch the script again."
-		echo "$MW_FILENAME downloaded in $(pwd). "\
+		echo "$MW_FILENAME downloaded in $(pwd)/ "\
 			"You can delete it later if you want."
 	else
-		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
+		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)/"
 	fi
 	archive_abs_path=$(pwd)/$MW_FILENAME
 	cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||