projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
curl-de-sac extensions added
[brisk.git]
/
INSTALL.sh
diff --git
a/INSTALL.sh
b/INSTALL.sh
index
3c25449
..
347b652
100755
(executable)
--- a/
INSTALL.sh
+++ b/
INSTALL.sh
@@
-120,7
+120,8
@@
if [ "$1" = "pkg" ]; then
fi
nam1="brisk_${tag}.tgz"
nam2="brisk-img_${tag}.tgz"
fi
nam1="brisk_${tag}.tgz"
nam2="brisk-img_${tag}.tgz"
- echo "Build packages ${nam1} and ${nam2}."
+ nam2="curl-de-sac_${tag}.tgz"
+ echo "Build packages ${nam1}, ${nam2} and ${nam3}."
read -p "Proceed [y/n]: " a
if [ "$a" != "y" -a "$a" != "Y" ]; then
exit 1
read -p "Proceed [y/n]: " a
if [ "$a" != "y" -a "$a" != "Y" ]; then
exit 1
@@
-129,11
+130,15
@@
if [ "$1" = "pkg" ]; then
cd ../brisk-img
git archive --format=tar --prefix=brisk-${tag}/brisk-img/ $tag | gzip > ../$nam2
cd -
cd ../brisk-img
git archive --format=tar --prefix=brisk-${tag}/brisk-img/ $tag | gzip > ../$nam2
cd -
+ cd ../curl-de-sac
+ git archive --format=tar --prefix=brisk-${tag}/curl-de-sac/ $tag | gzip > ../$nam3
+ cd -
exit 0
fi
if [ -f "$CONFIG_FILE" ]; then
source "$CONFIG_FILE"
exit 0
fi
if [ -f "$CONFIG_FILE" ]; then
source "$CONFIG_FILE"
+ conffile_in="$CONFIG_FILE"
fi
if [ "x$prefix_path" = "x" ]; then
fi
if [ "x$prefix_path" = "x" ]; then
@@
-175,6
+180,7
@@
while [ $# -gt 0 ]; do
exit 1
fi
. "$conffile"
exit 1
fi
. "$conffile"
+ conffile_in="$conffile"
fi
shift $sh
done
fi
shift $sh
done
@@
-341,7
+347,7
@@
if [ "$web_only" = "FALSE" ]; then
fi
install -d ${web_path}__
fi
install -d ${web_path}__
-for i in $(find web -type d | sed 's/^....//g'); do
+for i in $(find web -type d |
grep '/' |
sed 's/^....//g'); do
install -d ${web_path}__/$i
done
install -d ${web_path}__/$i
done
@@
-410,6
+416,15
@@
if [ -d ../brisk-img ]; then
./INSTALL.sh -w ${web_path}__
cd - >/dev/null 2>&1
fi
./INSTALL.sh -w ${web_path}__
cd - >/dev/null 2>&1
fi
+if [ -d ../curl-de-sac ]; then
+ cd ../curl-de-sac
+ if [ ! -z "$conffile_in" ]; then
+ ./INSTALL.sh -f "$conffile_in" -w ${web_path}__
+ else
+ ./INSTALL.sh -w ${web_path}__
+ fi
+ cd - >/dev/null 2>&1
+fi
# config file installation or diff
if [ -f "$etc_path/$brisk_conf" ]; then
# config file installation or diff
if [ -f "$etc_path/$brisk_conf" ]; then