1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
|
Author: Adnan Hodzic <adnan@foolcontrol.org>
Subject: Fix bashisms in Eclipse (in /bin/sh scripts)
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=581099
Last-Update: 2010-06-18
--- eclipse-3.5.2.orig/patches/eclipse-pde.build-add-package-build.patch
+++ eclipse-3.5.2/patches/eclipse-pde.build-add-package-build.patch
@@ -53,7 +53,7 @@ diff -N templates/package-build/prepare-
+ PROJECTDIR=$(dirname "$f")
+ inSDK=1
+ inSDK=$(echo $PROJECTDIR | grep -c $BUILDDIR)
-+ if [ $inSDK == 0 ]; then
++ if [ $inSDK = 0 ]; then
+ PROJECTNAME=$(ant -Dbasedir="$PROJECTDIR" -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
+ ERROR=""
+ if [ -z "$PROJECTNAME" ]; then
@@ -66,7 +66,7 @@ diff -N templates/package-build/prepare-
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ echo " making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
+ ln -sfT "$PROJECTDIR" $BUILDDIR/features/"$PROJECTNAME"
+ fi
@@ -81,7 +81,7 @@ diff -N templates/package-build/prepare-
+ ERROR=""
+ inSDK=1
+ inSDK=$(echo $dir | grep -c $BUILDDIR)
-+ if [ $inSDK == 0 ]; then
++ if [ $inSDK = 0 ]; then
+ if [ -e "$dir/META-INF/MANIFEST.MF" ]; then
+ PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
+ elif [ -e "$dir/plugin.xml" ]; then
@@ -100,7 +100,7 @@ diff -N templates/package-build/prepare-
+ fi
+
+ if [ "x$ERROR" != "xyes" ]; then
-+ if [[ $TESTING != true || `echo $PROJECTNAME | grep "org.eclipse"` ]]; then
++ if [ $TESTING != true -o `echo $PROJECTNAME | grep "org.eclipse"` ]; then
+ echo " making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
+ ln -sfT "$dir" $BUILDDIR/plugins/"$PROJECTNAME"
+ fi
|