aboutsummaryrefslogtreecommitdiffstats
path: root/infrastructure
diff options
context:
space:
mode:
authorMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-04 16:23:27 +0300
committerMikko Rantalainen <mikko.rantalainen@peda.net>2010-05-06 11:30:22 +0300
commit7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7 (patch)
tree6ae1858adc78cb2dbbc0aa283a3bf2576a21fb1d /infrastructure
parent9c31a14b268b4e7c42d7302d7b3830faacc0b45a (diff)
downloadetherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.tar.gz
etherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.tar.xz
etherpad-7d7fb9f26aa59584b7916bd6ea383473bb7bdfb7.zip
Fixed debian installation scripts
Directory /usr/share/etherpad/etherpad/data was not created which caused install process to stop with error message: Adding system-user for etherpad chown: cannot access `/usr/share/etherpad/etherpad/data': No such file or directory dpkg: error processing etherpad (--install): subprocess installed post-installation script returned error exit status 1 Processing triggers for ureadahead ... Errors were encountered while processing: etherpad Fixed location of scala-library.jar in Ubuntu. This may need changes in the future to help building the JAR on both Debian based systems and other systems. Added scala-library to Build-Depends in addition to scala dependency.
Diffstat (limited to 'infrastructure')
-rwxr-xr-xinfrastructure/bin/makejar.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/infrastructure/bin/makejar.sh b/infrastructure/bin/makejar.sh
index c774fa6..feace68 100755
--- a/infrastructure/bin/makejar.sh
+++ b/infrastructure/bin/makejar.sh
@@ -32,11 +32,11 @@ fi
TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s`
-JARFILES=`echo $SCALA_HOME/lib/scala-library.jar lib/*.jar lib/manifest`
+JARFILES=`echo $SCALA_HOME/scala-library.jar lib/*.jar lib/manifest`
function genjar {
echo "unzipping JARs..."
pushd $1 >> /dev/null
- $JAR xf $SCALA_HOME/lib/scala-library.jar
+ $JAR xf $SCALA_HOME/scala-library.jar
rm -rf META-INF
for a in ../../lib/*.jar; do
$JAR xf $a