[Libreoffice-commits] core.git: bin/distro-install-sdk

[Bjoern Michaelsen]

 bin/distro-install-sdk |   36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

New commits:
commit db0b333ea6cb04241a78f55b39884eeb87ee6215
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 26 13:19:50 2013 +0200

    setsdkenv_unix.csh is no more
    
    Change-Id: I1f20dbc690be23c013c26c0a37b8d6eceef0f51d

diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 36b0e23..33554e8 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -65,24 +65,22 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
     echo "$DOCDIR/sdk/examples"                                 >>$DESTDIR/gid_Module_Root_SDK
 
     # generate default profiles
-    for file in setsdkenv_unix.csh setsdkenv_unix.sh ; do
-        sed -e "s, at OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
-	    -e "s, at OO_SDK_HOME@,$INSTALLDIR/sdk," \
-	    -e "s, at OFFICE_HOME@,$INSTALLDIR," \
-	    -e "s, at OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
-	    -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
-	    -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
-	    -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
-	    -e "s, at OO_SDK_SED_HOME@,/usr/bin," \
-	    -e "s, at OO_SDK_CAT_HOME@,/usr/bin," \
-	    -e "s, at OO_SDK_CC_55_OR_HIGHER@,," \
-	    -e "s, at OO_SDK_JAVA_HOME@,$JAVA_HOME," \
-	    -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
-	    -e "s, at SDK_AUTO_DEPLOYMENT@,NO," \
-            $DESTDIR$INSTALLDIR/sdk/$file.in \
-	    > $DESTDIR$INSTALLDIR/sdk/$file
-	chmod 755 $DESTDIR$INSTALLDIR/sdk/$file
-	echo $INSTALLDIR/sdk/$file >>$DESTDIR/gid_Module_Root_SDK
-    done
+    sed -e "s, at OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
+        -e "s, at OO_SDK_HOME@,$INSTALLDIR/sdk," \
+        -e "s, at OFFICE_HOME@,$INSTALLDIR," \
+        -e "s, at OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
+        -e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_CPP_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_SED_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_CAT_HOME@,/usr/bin," \
+        -e "s, at OO_SDK_CC_55_OR_HIGHER@,," \
+        -e "s, at OO_SDK_JAVA_HOME@,$JAVA_HOME," \
+        -e "s, at OO_SDK_OUTPUT_DIR@,\$HOME," \
+        -e "s, at SDK_AUTO_DEPLOYMENT@,NO," \
+            $DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh.in \
+        > $DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh
+    chmod 755 $DESTDIR$INSTALLDIR/sdk/setsdkenv_unix.sh
+    echo $INSTALLDIR/sdk/setsdkenv_unix.sh >>$DESTDIR/gid_Module_Root_SDK
 
 fi