From 5ff38e903a9ada8938aa71695af44b8bdde29fa9 Mon Sep 17 00:00:00 2001
From: p4bl0 <pablo@rauzy.name>
Date: Mon, 2 Aug 2010 13:49:17 +0200
Subject: post-receive now works :-)

---
 install.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 758a49f..476515e 100644
--- a/install.sh
+++ b/install.sh
@@ -15,10 +15,14 @@ fugitive_install_hooks() {
   (base64 -d | gunzip) > .git/hooks/post-commit <<EOF
 #INCLUDE:post-commit.sh#
 EOF
-  chmod +x .git/hooks/post-commit
   (base64 -d | gunzip) > .git/hooks/post-receive <<EOF
 #INCLUDE:post-receive.sh#
 EOF
+  (base64 -d | gunzip | \
+    tee -a .git/hooks/post-commit) >> .git/hooks/post-receive <<EOF
+#INCLUDE:html-gen.sh#
+EOF
+  chmod +x .git/hooks/post-commit
   chmod +x .git/hooks/post-receive
   echo "done."
 }
@@ -85,7 +89,7 @@ EOF
     echo "done."
     echo -n "Importing files into git repository... "
     git add _templates/* _public/*.css >/dev/null
-    git commit -m "fugitive inital import" >/dev/null
+    git commit -m "fugitive inital import" &>/dev/null
     echo "done."
     echo "Writing dummy article (README) and adding it to the repos... "
     (base64 -d | gunzip) > _articles/README <<EOF
@@ -95,12 +99,13 @@ EOF
     git ci -m "fugitive: README" >/dev/null
     echo "done."
   fi
+  echo "Installation complete, please set your blog url using"
+  echo '`git config fugitive.blog-url "<url>"`.'
   cd - >/dev/null
-  echo 'Installation almost complete, please visit your blog :-).'
 }
 
 case "$1" in
-  "--help") fugitive_help >&2;;
+  "--help"|"-h") fugitive_help >&2;;
   "--install"|"--install-local") fugitive_install "$2" "local";;
   "--install-remote") fugitive_install "$2" "remote";;
   "--install-hooks") fugitive_install_hooks "$2";;
-- 
cgit v1.2.3