undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-remote-mediawiki: allow stop/start-ing the test server

Browse Source 
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>
This commit is contained in:
Matthieu Moy 2014-04-23 16:34:28 +02:00 committed by Junio C Hamano
parent 779792a5f2
commit 1c4ea83902
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/mw-to-git/t/install-wiki.sh
View File

@ -20,6 +20,8 @@ usage () {
echo " install | -i : Install a wiki on your computer." echo " install | -i : Install a wiki on your computer."
echo " delete | -d : Delete the wiki and all its pages and " echo " delete | -d : Delete the wiki and all its pages and "
echo " content." echo " content."
echo " start | -s : Start the previously configured lighttpd daemon"
echo " stop : Stop lighttpd daemon."
} }
@ -33,6 +35,14 @@ case "$1" in
wiki_delete wiki_delete
exit 0 exit 0
;; ;;
"start" | "-s")
start_lighttpd
exit
;;
"stop")
stop_lighttpd
exit
;;
"--help" | "-h") "--help" | "-h")
usage usage
exit 0 exit 0

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

@ -289,7 +289,6 @@ start_lighttpd () {
# Kill daemon lighttpd and removes files and folders associated. # Kill daemon lighttpd and removes files and folders associated.
stop_lighttpd () { stop_lighttpd () {
test -f "$WEB_TMP/pid" && kill $(cat "$WEB_TMP/pid") 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 # Create the SQLite database of the MediaWiki. If the database file already
@ -415,6 +414,7 @@ wiki_reset () {
wiki_delete () { wiki_delete () {
if test $LIGHTTPD = "true"; then if test $LIGHTTPD = "true"; then
stop_lighttpd stop_lighttpd
rm -fr "$WEB"
else else
# Delete the wiki's directory. # Delete the wiki's directory.
rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" || rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||