summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorp4bl0 <pablo@rauzy.name>2010-08-08 19:46:29 +0200
committerp4bl0 <pablo@rauzy.name>2010-08-08 19:46:29 +0200
commit18f54a6df31ba47100b98ceb8aef66c967c618c9 (patch)
tree0036f432dcbbd47026ae68421a590642f63e651a
parentc661fda93d737e0b919fd40dcace5ca46bb937a2 (diff)
fixed little bug (sh doesn't know about &> redirection)
-rwxr-xr-xbuild.sh4
-rw-r--r--install.sh8
2 files changed, 6 insertions, 6 deletions
diff --git a/build.sh b/build.sh
index a012ce7..e1ae511 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
include_file() {
f=`echo -n $2 | sed 's/\//\\\\\//g'`
- tmp=`tempfile -p "figitive"`
+ tmp=`mktemp --suffix "-fugitive"`
cat "$2" | gzip | base64 > "$tmp"
cat "$1" | sed "/#INCLUDE:$f#/ {
r $tmp
@@ -12,7 +12,7 @@ include_file() {
cp install.sh tmp1
i=1
-for f in README post-commit.sh post-receive.sh html-gen.sh default-files/*; do
+for f in README *-*.sh default-files/*; do
j=$((1 - i))
include_file tmp$i "$f" > tmp$j
i=$j
diff --git a/install.sh b/install.sh
index 476515e..47158d8 100644
--- a/install.sh
+++ b/install.sh
@@ -89,14 +89,14 @@ 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 2>&1
echo "done."
echo "Writing dummy article (README) and adding it to the repos... "
(base64 -d | gunzip) > _articles/README <<EOF
#INCLUDE:README#
EOF
git add _articles/README
- git ci -m "fugitive: README" >/dev/null
+ git commit -m "fugitive: README" >/dev/null
echo "done."
fi
echo "Installation complete, please set your blog url using"
@@ -105,9 +105,9 @@ EOF
}
case "$1" in
- "--help"|"-h") fugitive_help >&2;;
+ "--help"|"-h") fugitive_help >&2;; # TODO
"--install"|"--install-local") fugitive_install "$2" "local";;
"--install-remote") fugitive_install "$2" "remote";;
"--install-hooks") fugitive_install_hooks "$2";;
- *) fugitive_usage >&2;;
+ *) fugitive_usage >&2;; # TODO
esac