mirror of
https://git.ludikovsky.name/git/fugitive.git
synced 2024-06-30 21:25:26 +02:00
fixed little bug (sh doesn't know about &> redirection)
This commit is contained in:
parent
c661fda93d
commit
18f54a6df3
4
build.sh
4
build.sh
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
include_file() {
|
include_file() {
|
||||||
f=`echo -n $2 | sed 's/\//\\\\\//g'`
|
f=`echo -n $2 | sed 's/\//\\\\\//g'`
|
||||||
tmp=`tempfile -p "figitive"`
|
tmp=`mktemp --suffix "-fugitive"`
|
||||||
cat "$2" | gzip | base64 > "$tmp"
|
cat "$2" | gzip | base64 > "$tmp"
|
||||||
cat "$1" | sed "/#INCLUDE:$f#/ {
|
cat "$1" | sed "/#INCLUDE:$f#/ {
|
||||||
r $tmp
|
r $tmp
|
||||||
|
@ -12,7 +12,7 @@ include_file() {
|
||||||
|
|
||||||
cp install.sh tmp1
|
cp install.sh tmp1
|
||||||
i=1
|
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))
|
j=$((1 - i))
|
||||||
include_file tmp$i "$f" > tmp$j
|
include_file tmp$i "$f" > tmp$j
|
||||||
i=$j
|
i=$j
|
||||||
|
|
|
@ -89,14 +89,14 @@ EOF
|
||||||
echo "done."
|
echo "done."
|
||||||
echo -n "Importing files into git repository... "
|
echo -n "Importing files into git repository... "
|
||||||
git add _templates/* _public/*.css >/dev/null
|
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 "done."
|
||||||
echo "Writing dummy article (README) and adding it to the repos... "
|
echo "Writing dummy article (README) and adding it to the repos... "
|
||||||
(base64 -d | gunzip) > _articles/README <<EOF
|
(base64 -d | gunzip) > _articles/README <<EOF
|
||||||
#INCLUDE:README#
|
#INCLUDE:README#
|
||||||
EOF
|
EOF
|
||||||
git add _articles/README
|
git add _articles/README
|
||||||
git ci -m "fugitive: README" >/dev/null
|
git commit -m "fugitive: README" >/dev/null
|
||||||
echo "done."
|
echo "done."
|
||||||
fi
|
fi
|
||||||
echo "Installation complete, please set your blog url using"
|
echo "Installation complete, please set your blog url using"
|
||||||
|
@ -105,9 +105,9 @@ EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
"--help"|"-h") fugitive_help >&2;;
|
"--help"|"-h") fugitive_help >&2;; # TODO
|
||||||
"--install"|"--install-local") fugitive_install "$2" "local";;
|
"--install"|"--install-local") fugitive_install "$2" "local";;
|
||||||
"--install-remote") fugitive_install "$2" "remote";;
|
"--install-remote") fugitive_install "$2" "remote";;
|
||||||
"--install-hooks") fugitive_install_hooks "$2";;
|
"--install-hooks") fugitive_install_hooks "$2";;
|
||||||
*) fugitive_usage >&2;;
|
*) fugitive_usage >&2;; # TODO
|
||||||
esac
|
esac
|
||||||
|
|
Loading…
Reference in a new issue