Commit 12e0f077 authored by Kristina Hoeppner's avatar Kristina Hoeppner

Merge branch 'check-git-url' into 'master'

Make postinst check for git code correctly.

- The check for a configured git checkout was always failing.
 - Added a big giant notice in the installation output when the build
   directory has been nuked from orbit; rebuilt with cron jobs.

See merge request !3
parents 6fac0473 346df151
......@@ -29,7 +29,7 @@ esac
# but better than no check :D
if [ -d $DIRNAME ]
then
if grep -Fxq $GITURL $DIRNAME/.git/config
if grep -Fq "url = $GITURL" $DIRNAME/.git/config
then
# If we have what appears to be the correct git contents,
# just quit the script cleanly and let the rest of the
......@@ -41,6 +41,11 @@ then
# However if it looks wrong, check if its a-ok to overwrite
if [ "$OVERWRITEDIR" == "ok" ]
then
echo "${bold}*******************************************************************${normal}"
echo "${bold}* Deleting and re-fetching the Mahara manual code. The build dir *${normal}"
echo "${bold}* will not be rebuilt until the cron job(s) run, so you probably *${normal}"
echo "${bold}* want to run them manually after this installation. *${normal}"
echo "${bold}*******************************************************************${normal}"
# Buhbye!
rm -rf $DIRNAME
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment