]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Change install.sh to work on fresh install
authorJeff Peeler <jpeeler@redhat.com>
Fri, 22 Jun 2012 16:26:38 +0000 (12:26 -0400)
committerJeff Peeler <jpeeler@redhat.com>
Fri, 22 Jun 2012 16:26:38 +0000 (12:26 -0400)
Also, change shell to allow use of bash on Debian.

Change-Id: I53b038432389c824556d90ea686c28d132708904
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
install.sh

index c9cbbe1b09bf80825c6ce1812fcddb1e3c5b731c..bc34f4e9ccd0016d7a168afb918ba4b9c2207c5f 100755 (executable)
@@ -1,22 +1,30 @@
-#!/bin/sh
+#!/bin/bash
 
-mkdir -p /var/log/heat
-mkdir -p /etc/heat
+if [[ $EUID -ne 0 ]]; then
+    echo "This script must be run as root"
+    exit 1
+fi
 
-pushd etc
+CONF_DIR=/etc/heat
+LOG_DIR=/var/log/heat
+
+mkdir -p $LOG_DIR
+mkdir -p $CONF_DIR
+
+pushd etc > /dev/null
 for f in *
 do
-    if [ -d $f ] ; then
-        #ignore
-        s=0
-    elif [ -f $f ] ; then
-        echo not coping over /etc/heat/$f
-        diff -u /etc/heat/$f $f
+    if [ -d $f ]; then
+        # ignore directories
+        continue
+    elif [ -f $CONF_DIR/$f ]; then
+        echo "not copying over $CONF_DIR/$f"
+        diff -u $CONF_DIR/$f $f
     else
-        cp $f /etc/heat/
+        cp $f $CONF_DIR
     fi
 done
-popd
+popd > /dev/null
 
 ./setup.py install --root=/ >/dev/null
 rm -rf build heat.egg-info