summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git/t/test-gitmw-lib.sh
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2014-04-23 16:34:28 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-23 15:22:53 -0700
commit1c4ea83902e2a64472ccf99ced4ea773ad3dd8aa (patch)
tree107ff6437e7687e5b72fb2bec187d79aa4c31ac7 /contrib/mw-to-git/t/test-gitmw-lib.sh
parentUpdate draft release notes to 2.0 (diff)
downloadtgif-1c4ea83902e2a64472ccf99ced4ea773ad3dd8aa.tar.xz
git-remote-mediawiki: allow stop/start-ing the test server
Previously, the user had to launch a complete re-install after a lighttpd stop (e.g. a reboot). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/mw-to-git/t/test-gitmw-lib.sh')
-rwxr-xr-xcontrib/mw-to-git/t/test-gitmw-lib.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index 3372b2af34..d9a114995a 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -289,7 +289,6 @@ start_lighttpd () {
# Kill daemon lighttpd and removes files and folders associated.
stop_lighttpd () {
test -f "$WEB_TMP/pid" && kill $(cat "$WEB_TMP/pid")
- rm -rf "$WEB"
}
# Create the SQLite database of the MediaWiki. If the database file already
@@ -415,6 +414,7 @@ wiki_reset () {
wiki_delete () {
if test $LIGHTTPD = "true"; then
stop_lighttpd
+ rm -fr "$WEB"
else
# Delete the wiki's directory.
rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||