diff --git a/build/compile-web-html b/build/compile-web-html index a83e3d1..58267e8 100755 --- a/build/compile-web-html +++ b/build/compile-web-html @@ -19,14 +19,14 @@ learnmore=../web/learnmore function replaceStrings() { echo $1 $M - sed -i '' -f replace_html.sed $1 - sed -i '' -f replace_html_$M.sed $1 - sed -i '' -e s/__VERSION__/$V/g $1 - sed -i '' -e s/__THIS_YEAR__/2013/g $1 + ./seds -f replace_html.sed $1 + ./seds -f replace_html_$M.sed $1 + ./seds -e s/__VERSION__/$V/g $1 + ./seds -e s/__THIS_YEAR__/2013/g $1 echo $COMPANY - sed -i '' -e s/{##TITLE##}/$APP_TITLE/g $1 - sed -i '' -e s/{##COMPANY##}/"$COMPANY"/g $1 + ./seds -e s/{##TITLE##}/$APP_TITLE/g $1 + ./seds -e s/{##COMPANY##}/"$COMPANY"/g $1 } echo Compiling CSS/JS diff --git a/build/compile-web-js b/build/compile-web-js index e35d5d9..29f7b93 100755 --- a/build/compile-web-js +++ b/build/compile-web-js @@ -11,15 +11,15 @@ HOST_WEB=`cat ../config/hosts/web_$M` RECAPTCHA_PUBLIC_KEY=`cat ../keys/recaptcha/public.key` function replaceStrings() { - sed -i '' -f replace_js_$M.sed $1 - sed -i '' -e s/__VERSION__/$V/g $1 - sed -i '' -e s/__THIS_YEAR__/2013/g $1 + ./seds -f replace_js_$M.sed $1 + ./seds -e s/__VERSION__/$V/g $1 + ./seds -e s/__THIS_YEAR__/2013/g $1 - sed -i '' -e s/{##HOST_PRIMARY##}/$HOST_PRIMARY/g $1 - sed -i '' -e s/{##HOST_AUTH##}/$HOST_AUTH/g $1 - sed -i '' -e s/{##HOST_TOMCAT##}/$HOST_TOMCAT/g $1 - sed -i '' -e s/{##HOST_WEB##}/$HOST_WEB/g $1 - sed -i '' -e s/{##RECAPTCHA_PUBLIC_KEY##}/$RECAPTCHA_PUBLIC_KEY/g $1 + ./seds -e s/{##HOST_PRIMARY##}/$HOST_PRIMARY/g $1 + ./seds -e s/{##HOST_AUTH##}/$HOST_AUTH/g $1 + ./seds -e s/{##HOST_TOMCAT##}/$HOST_TOMCAT/g $1 + ./seds -e s/{##HOST_WEB##}/$HOST_WEB/g $1 + ./seds -e s/{##RECAPTCHA_PUBLIC_KEY##}/$RECAPTCHA_PUBLIC_KEY/g $1 } echo Replacing Strings diff --git a/build/seds b/build/seds new file mode 100755 index 0000000..0741a9b --- /dev/null +++ b/build/seds @@ -0,0 +1,7 @@ +platform='unknown' +unamestr=`uname` +if [[ "$unamestr" == 'Linux' ]]; then + sed -i $* +elif [[ "$unamestr" == 'Darwin' ]]; then + sed -i '' $* +fi diff --git a/install/setup-java.remote b/install/setup-java.remote index a0d3a19..3141846 100755 --- a/install/setup-java.remote +++ b/install/setup-java.remote @@ -3,6 +3,7 @@ # I realized: why bother? apt-get install software-properties-common --yes +apt-get install python-software-properties --yes add-apt-repository ppa:webupd8team/java --yes apt-get update