Permalink
Browse files

fix rebar-related installation errors

Fix install-related errors caused by refactoring for rebar. One error
was that the new gen-yaws-conf script was trying to create directories
needed for the local-install script, and the other was that the
regular-install script was attempting to create a directory named
$DESTDIR, which is typically an empty string.
  • Loading branch information...
1 parent 61a1116 commit bccfd7fc55a0c2fe22af0b70061263f13c2d3fec @vinoski vinoski committed May 8, 2011
Showing with 3 additions and 4 deletions.
  1. +0 −3 scripts/gen-yaws-conf
  2. +2 −0 scripts/local-install
  3. +1 −1 scripts/regular-install
View
@@ -5,9 +5,6 @@
set -e
-[ -d "${VARDIR}/yaws" ] || mkdir "${VARDIR}/yaws"
-[ -d "${VARDIR}/yaws/ebin" ] || mkdir "${VARDIR}/yaws/ebin"
-
cat yaws.conf.template | \
./Subst %yawsdir% "$YAWSDIR" | \
./Subst %logdir% "$LOGDIR" | \
View
@@ -27,6 +27,8 @@ else
fi
topdir=`cd .. && pwd`
+[ -d "${VARDIR}/yaws" ] || mkdir "${VARDIR}/yaws"
+[ -d "${VARDIR}/yaws/ebin" ] || mkdir "${VARDIR}/yaws/ebin"
YAWSDIR="$topdir" LOGDIR="$logdir" VARDIR="$VARDIR" PORT=8000 \
DOCROOT="${topdir}/www" CERTDIR="${topdir}/ssl" SSLPORT=4443 \
./gen-yaws-conf > $tmpgen
View
@@ -15,7 +15,7 @@ if [ -f "$conffile" ]; then
cp yaws.conf "${conffile}.template"
else
echo "Installing $conffile"
- mkdir "$DESTDIR"
+ [ -n "$DESTDIR" ] && mkdir "$DESTDIR"
mkdir "${DESTDIR}${ETCDIR}"
mkdir "${DESTDIR}${ETCDIR}/yaws"
cp yaws.conf "$conffile"

0 comments on commit bccfd7f

Please sign in to comment.