[Lunar-commits] <moonbase> scala-bin: version bump to 2.9.0 and ...

[Christian Krause]

commit 4d90ca0a1f61ede23f9f56982b3de2e057a31122
Author: Christian Krause <wookietreiber at lunar-linux.org>
Date:   Sat May 14 14:27:42 2011 +0200

    scala-bin: version bump to 2.9.0 and ...
    
    - scala.rc (SCALA_HOME, PATH, MANPATH) for profile.d replaces symlinks
    - fixed some lrm scala-bin bugs (use of install)
    - don't install source jars
    - install up2date bash_completion.d script
---
 zbeta/scala-bin/BUILD              |   23 ++++++++---------------
 zbeta/scala-bin/DETAILS            |   24 ++++++++++++------------
 zbeta/scala-bin/profile.d/scala.rc |    3 +++
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/zbeta/scala-bin/BUILD b/zbeta/scala-bin/BUILD
index 28030dd..63431d1 100644
--- a/zbeta/scala-bin/BUILD
+++ b/zbeta/scala-bin/BUILD
@@ -1,28 +1,21 @@
 (
 
   # remove *.bat files
-  rm $SOURCE_DIRECTORY/bin/*.bat &&
+  rm -rf $SOURCE_DIRECTORY/bin/*.bat $SOURCE_DIRECTORY/src/ &&
 
   prepare_install &&
 
   # copy extracted files
-  mkdir -p /usr/scala                &&
+  install -d /usr/scala              &&
   cp -r $SOURCE_DIRECTORY /usr/scala &&
 
   # symlink default and latest (like java)
-  ln -sf /usr/scala/$MOD-${VERSION}.final /usr/scala/latest &&
-  if [ ! -h /usr/scala/default ]; then
-    ln -sf /usr/scala/latest /usr/scala/default
-  fi &&
+  ln -s /usr/scala/$MOD-$VER /usr/scala/latest  &&
+  ln -s /usr/scala/latest    /usr/scala/default &&
 
-  # symlink bin folder
-  for file in /usr/scala/latest/bin/*; do
-    ln -sf $file /usr/bin/ || exit 1
-  done &&
-
-  # symlink man folder
-  for file in /usr/scala/latest/man/man1/*; do
-    ln -sf $file /usr/man/man1/ || exit 1
-  done
+  # bash completion
+  install -d /etc/bash_completion.d &&
+  install -m755 $SOURCE_DIRECTORY/misc/scala-tool-support/bash-completion/scala_completion.sh \
+                /etc/bash_completion.d/scala-bash-completion.sh
 
 ) > $C_FIFO 2>&1
diff --git a/zbeta/scala-bin/DETAILS b/zbeta/scala-bin/DETAILS
index 990daee..5279cba 100644
--- a/zbeta/scala-bin/DETAILS
+++ b/zbeta/scala-bin/DETAILS
@@ -1,23 +1,23 @@
           MODULE=scala-bin
              MOD=scala
-         VERSION=2.8.1
-          SOURCE=$MOD-$VERSION.final.tgz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION.final
+         VERSION=2.9.0
+             VER=$VERSION.final
+          SOURCE=$MOD-$VER.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VER
       SOURCE_URL=http://www.scala-lang.org/downloads/distrib/files/
-      SOURCE_VFY=sha1:b225e97652e06a3881de64321a46a488eaa3a15e
-        WEB_SITE=http://www.scala-lang.org
+      SOURCE_VFY=sha1:f74295c265d8616b1bfa3feb4e59a4eeb3043d0b
+        WEB_SITE=http://www.scala-lang.org/
          ENTERED=20101128
-         UPDATED=20101128
+         UPDATED=20110514
            SHORT="general purpose programming language"
        LDD_CHECK=off
          ARCHIVE=off
 
 cat << EOF
-Scala is a general purpose programming language designed to
-express common programming patterns in a concise, elegant
-and type-safe way. It smoothly integrates features of
-object-oriented and functional languages. It is also fully
-interoperable with Java and runs on any JVM, since it
-compiles to Java bytecode, i.e. indistinguishable from
+Scala is a general purpose programming language designed to express
+common programming patterns in a concise, elegant and type-safe way.
+It smoothly integrates features of object-oriented and functional
+languages. It is also fully interoperable with Java and runs on any
+JVM, since it compiles to Java bytecode, i.e. indistinguishable from
 Java-generated bytecode.
 EOF
diff --git a/zbeta/scala-bin/profile.d/scala.rc b/zbeta/scala-bin/profile.d/scala.rc
new file mode 100644
index 0000000..9604fe5
--- /dev/null
+++ b/zbeta/scala-bin/profile.d/scala.rc
@@ -0,0 +1,3 @@
+export SCALA_HOME="/usr/scala/latest"
+export PATH="$PATH:$SCALA_HOME/bin"
+export MANPATH="$MANPATH:$SCALA_HOME/man"