Fix run script for python2.6

[irc/quakenet/qwebirc.git] / compile.sh

diff --git a/compile.sh b/compile.sh
index 3d4038735876ef4732159455afb34e3e671afcc4..66072a1488e9d2bfac575cac76105fe41a3d5db7 100755 (executable)
--- a/compile.sh
+++ b/compile.sh
@@ -3,9 +3,8 @@ mkdir -p compiled
 rm -f compiled/*.js
 
 cd js
-cat version.js jslib.js irc/ircconnection.js irc/irclib.js irc/baseirc.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/colour.js ui/theme.js qwebircinterface.js > ../compiled/qwebirc-concat.js
+cat version.js jslib.js irc/ircconnection.js irc/irclib.js irc/baseircclient.js irc/irctracker.js irc/commandparser.js irc/ircclient.js ui/baseui.js ui/baseuiwindow.js ui/colour.js ui/theme.js qwebircinterface.js > ../compiled/qwebirc-concat.js
 cat ui/swmlayout.js ui/swmui.js > ../compiled/swmui-concat.js
-cd ../compiled
 
 error() {
   cd ..
@@ -13,24 +12,26 @@ error() {
   exit 1
 }
 
+catit() {
+  cat js/copyright.js compiled/$1-compiled.js > static/js/$1.js
+}
+
 jarit() {
-  java -jar ../bin/yuicompressor-2.3.5.jar $1.js > $2-compiled.js
+  SRC=$1
+  DST=$2
+  cd ../compiled
+  java -jar ../bin/yuicompressor-2.3.5.jar $SRC.js > $DST-compiled.js
   if [ "$?" != 0 ]; then
     error
   fi
-}
-
-catit() {
-  cat js/copyright.js compiled/$1-compiled.js > static/js/$1.js
+  cd ..
+  catit $DST
+  rm $DST-compiled.js
 }
 
 jarit qwebirc-concat qwebirc
 jarit ../js/ui/uglyui uglyui
 jarit swmui-concat swmui
+jarit ..\js\ui\mochaui.js mochaui
 
-cd ..
-catit qwebirc
-catit uglyui
-catit swmui
-rm -f compiled/*.js
 rmdir compiled