mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-mediawiki tests: change [] to test

Browse Source 
Convert `[]` to `test` and break if-then into separate lines, both of
which bring the style in line with Git's coding guidelines.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2020-09-21 12:39:49 +02:00
committed by Junio C Hamano
parent 090850e1b0
commit 730ecc10c7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/mw-to-git/t/test-gitmw-lib.sh
View File

@ -65,7 +65,7 @@ test_check_precond () {
GIT_EXEC_PATH=$(cd "$(dirname "$0")" && cd "../.." && pwd) GIT_EXEC_PATH=$(cd "$(dirname "$0")" && cd "../.." && pwd)
PATH="$GIT_EXEC_PATH"'/bin-wrapper:'"$PATH" PATH="$GIT_EXEC_PATH"'/bin-wrapper:'"$PATH"
if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ]; if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME"
then then
skip_all='skipping gateway git-mw tests, no mediawiki found' skip_all='skipping gateway git-mw tests, no mediawiki found'
test_done test_done
@ -304,7 +304,8 @@ create_db () {
php "$FILES_FOLDER/$DB_INSTALL_SCRIPT" $(basename "$DB_FILE" .sqlite) \ php "$FILES_FOLDER/$DB_INSTALL_SCRIPT" $(basename "$DB_FILE" .sqlite) \
"$WIKI_ADMIN" "$WIKI_PASSW" "$TMP" "$PORT" "$WIKI_ADMIN" "$WIKI_PASSW" "$TMP" "$PORT"
if [ ! -f "$TMP/$DB_FILE" ] ; then if ! test -f "$TMP/$DB_FILE"
then
error "Can't create database file $TMP/$DB_FILE. Try to run ./install-wiki.sh delete first." error "Can't create database file $TMP/$DB_FILE. Try to run ./install-wiki.sh delete first."
fi fi
@ -325,7 +326,8 @@ wiki_install () {
# unpack and copy the files of MediaWiki # unpack and copy the files of MediaWiki
( (
mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME" mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME"
if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ; then if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME"
then
error "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist. error "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist.
Please create it and launch the script again." Please create it and launch the script again."
fi fi
@ -333,7 +335,8 @@ wiki_install () {
# Fetch MediaWiki's archive if not already present in the TMP directory # Fetch MediaWiki's archive if not already present in the TMP directory
MW_FILENAME="mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz" MW_FILENAME="mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz"
cd "$TMP" cd "$TMP"
if [ ! -f $MW_FILENAME ] ; then if ! test -f $MW_FILENAME
then
echo "Downloading $MW_VERSION_MAJOR.$MW_VERSION_MINOR sources ..." echo "Downloading $MW_VERSION_MAJOR.$MW_VERSION_MINOR sources ..."
wget "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/$MW_FILENAME" || wget "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/$MW_FILENAME" ||
error "Unable to download "\ error "Unable to download "\
@ -359,7 +362,8 @@ wiki_install () {
# And modify parameters according to the ones set at the top # And modify parameters according to the ones set at the top
# of this script. # of this script.
# Note that LocalSettings.php is never modified. # Note that LocalSettings.php is never modified.
if [ ! -f "$FILES_FOLDER/LocalSettings.php" ] ; then if ! test -f "$FILES_FOLDER/LocalSettings.php"
then
error "Can't find $FILES_FOLDER/LocalSettings.php " \ error "Can't find $FILES_FOLDER/LocalSettings.php " \
"in the current folder. "\ "in the current folder. "\
"Please run the script inside its folder." "Please run the script inside its folder."
@ -401,7 +405,8 @@ wiki_install () {
# Warning: This function must be called only in a subdirectory of t/ directory # Warning: This function must be called only in a subdirectory of t/ directory
wiki_reset () { wiki_reset () {
# Copy initial database of the wiki # Copy initial database of the wiki
if [ ! -f "../$FILES_FOLDER/$DB_FILE" ] ; then if ! test -f "../$FILES_FOLDER/$DB_FILE"
then
error "Can't find ../$FILES_FOLDER/$DB_FILE in the current folder." error "Can't find ../$FILES_FOLDER/$DB_FILE in the current folder."
fi fi
cp "../$FILES_FOLDER/$DB_FILE" "$TMP" || cp "../$FILES_FOLDER/$DB_FILE" "$TMP" ||