projects
/
brisk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b758f8b
)
installation: reduce time when the install directry is unavailable
author
Matteo Nastasi (mop)
<nastasi@alternativeoutput.it>
Thu, 25 Sep 2014 06:13:29 +0000
(08:13 +0200)
committer
Matteo Nastasi (mop)
<nastasi@alternativeoutput.it>
Thu, 25 Sep 2014 06:13:29 +0000
(08:13 +0200)
INSTALL.sh
patch
|
blob
|
history
diff --git
a/INSTALL.sh
b/INSTALL.sh
index
347b652
..
705fdf2
100755
(executable)
--- a/
INSTALL.sh
+++ b/
INSTALL.sh
@@
-407,10
+407,6
@@
sed -i "s@\( \+cookiepath *: *\)\"[^\"]*\" *,@\1 \"$prefix_path\",@g" ${web_path
document_root="$(grep DocumentRoot "${apache_conf}" | grep -v '^[ ]*#' | awk '{ print $2 }')"
sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph*
document_root="$(grep DocumentRoot "${apache_conf}" | grep -v '^[ ]*#' | awk '{ print $2 }')"
sed -i "s@^\(\$DOCUMENT_ROOT *= *[\"']\)[^\"']*\([\"']\)@\1$document_root\2@g" ${web_path}__/spush/*.ph*
-if [ -d ${web_path} ]; then
- mv ${web_path} ${web_path}.old
-fi
-
if [ -d ../brisk-img ]; then
cd ../brisk-img
./INSTALL.sh -w ${web_path}__
if [ -d ../brisk-img ]; then
cd ../brisk-img
./INSTALL.sh -w ${web_path}__
@@
-439,6
+435,10
@@
else
cp "${web_path}__""/Obj/brisk.conf-templ.pho" "$etc_path/$brisk_conf"
fi
cp "${web_path}__""/Obj/brisk.conf-templ.pho" "$etc_path/$brisk_conf"
fi
+if [ -d ${web_path} ]; then
+ mv ${web_path} ${web_path}.old
+fi
+
mv ${web_path}__ ${web_path}
if [ -d ${web_path}.old ]; then
rm -rf ${web_path}.old
mv ${web_path}__ ${web_path}
if [ -d ${web_path}.old ]; then
rm -rf ${web_path}.old