ipaacatools/scripts/start-spread-local

@@ -5,6 +5,15 @@ if [ -d /vol/soa/opt64/spread ]; then
 	/vol/soa/opt64/spread/current/sbin/spread -n localhost &
 else
 	echo "Starting local-only spread daemon for ipaaca ..."
-	spread -n localhost &
+	spr=`which spread`
+	[ $? -eq 0 ] || {
+		echo spread not found in PATH - searching in /usr/sbin and /usr/local/sbin
+		spr=''
+		[ -e /usr/local/sbin/spread ] && spr="/usr/local/sbin/spread"
+		[ -e /usr/sbin/spread ] && spr="/usr/sbin/spread"
+		[ "$spr" = "" ] && echo "Could not find spread"
+		echo $spr
+	}
+	${spr} -n localhost &
 fi
 

resolve.sh

 #!/bin/bash
-
-# This file is deprecated.
-# Resolution is performed automatically in the soa script.
-
+# This file has been auto-generated by the soa script.
 eval "`grep '^REQUIRED=\|^OPTIONAL=' DEPS.txt`"
 REQ="$REQUIRED"
 OPT="$OPTIONAL"
-
 shopt -q nullglob || resetnullglob=1
 shopt -s nullglob
 shopt -q dotglob || resetdotglob=1
 shopt -s dotglob
-
+echo "Performing local resolution... "
 mkdir -p deps/bin
 mkdir -p deps/lib
 mkdir -p deps/include
 mkdir -p deps/scripts
 mkdir -p deps/python
 for P in $REQ $OPT; do
-	echo "Importing from $P ..."
+	echo "Importing from $P ..."
 	files=(../$P/dist/bin/*);
 	[ "$files" ] && cp -a ../$P/dist/bin/* deps/bin/
 	files=(../$P/dist/lib/*);
@@ -31,13 +27,21 @@ for P in $REQ $OPT; do
 	[ "$files" ] && for zipfile in ../$P/dist/python/*.zip; do
 		unzip -oqq $zipfile -d deps/python
 	done
+	files=(../$P/dist/*.cpp.zip);
+	[ "$files" ] && for zipfile in ../$P/dist/*.cpp.zip; do
+		unzip -oqq $zipfile -d deps/
+	done
 	files=(../$P/dist/*.py.zip);
 	[ "$files" ] && for zipfile in ../$P/dist/*.py.zip; do
 		unzip -oqq $zipfile -d deps/python
 	done
+	files=(../$P/dist/*.scripts.zip);
+	[ "$files" ] && for zipfile in ../$P/dist/*.scripts.zip; do
+		unzip -oqq $zipfile -d deps/scripts
+	done
+	chmod -R +x deps/bin
+	chmod -R +x deps/scripts
 done
-echo "Done."
-
+echo "Done."
 [ "$resetdotglob" ] && shopt -u dotglob
-[ "$resetnullglob" ] && shopt -u nullglob
-
+[ "$resetnullglob" ] && shopt -u nullglob