public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag

pull/1138/head
Bastian 2012-11-07 12:51:51 +01:00
parent 6148548e00
commit 05f96429ef
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/installDeps.sh
View File

@ -8,6 +8,14 @@ if [ -d "../bin" ]; then
cd "../" cd "../"
fi fi
#Is gnu-grep (ggrep) installed on SunOS (Solaris)
if [ $(uname) = "SunOS" ]; then
hash ggrep > /dev/null 2>&1 || {
echo "Please install ggrep (pkg install gnu-grep)" >&2
exit 1
}
fi
#Is wget installed? #Is wget installed?
hash curl > /dev/null 2>&1 || { hash curl > /dev/null 2>&1 || {
echo "Please install curl" >&2 echo "Please install curl" >&2
@ -52,7 +60,7 @@ done
#Does a $settings exist? if no copy the template #Does a $settings exist? if no copy the template
if [ ! -f $settings ]; then if [ ! -f $settings ]; then
echo "Copy the settings template to $settings..." echo "Copy the settings template to $settings..."
cp -v settings.json.template $settings || exit 1 cp settings.json.template $settings || exit 1
fi fi
echo "Ensure that all dependencies are up to date..." echo "Ensure that all dependencies are up to date..."
@ -71,7 +79,11 @@ echo "Ensure jQuery is downloaded and up to date..."
DOWNLOAD_JQUERY="true" DOWNLOAD_JQUERY="true"
NEEDED_VERSION="1.7.1" NEEDED_VERSION="1.7.1"
if [ -f "src/static/js/jquery.js" ]; then if [ -f "src/static/js/jquery.js" ]; then
VERSION=$(cat src/static/js/jquery.js | head -n 3 | grep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?"); if [ $(uname) = "SunOS"]; then
VERSION=$(cat src/static/js/jquery.js | head -n 3 | ggrep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?");
else
VERSION=$(cat src/static/js/jquery.js | head -n 3 | grep -o "v[0-9]\.[0-9]\(\.[0-9]\)\?");
fi
if [ ${VERSION#v} = $NEEDED_VERSION ]; then if [ ${VERSION#v} = $NEEDED_VERSION ]; then
DOWNLOAD_JQUERY="false" DOWNLOAD_JQUERY="false"
@ -91,11 +103,11 @@ echo "ensure custom css/js files are created..."
for f in "index" "pad" "timeslider" for f in "index" "pad" "timeslider"
do do
if [ ! -f "src/static/custom/$f.js" ]; then if [ ! -f "src/static/custom/$f.js" ]; then
cp -v "src/static/custom/js.template" "src/static/custom/$f.js" || exit 1 cp "src/static/custom/js.template" "src/static/custom/$f.js" || exit 1
fi fi
if [ ! -f "src/static/custom/$f.css" ]; then if [ ! -f "src/static/custom/$f.css" ]; then
cp -v "src/static/custom/css.template" "src/static/custom/$f.css" || exit 1 cp "src/static/custom/css.template" "src/static/custom/$f.css" || exit 1
fi fi
done done