org.handhelds.familiar/packages/sharp-binary-only/sharp-compat-libs/hentges.patch

   1 --- oz-compat-0.5/opt/QtPalmtop.compat/bin/makecompat.orig      2004-11-30 18:51:45.000000000 +0100
   2 +++ oz-compat-0.5//opt/QtPalmtop.compat/bin/makecompat  2004-11-30 18:44:29.000000000 +0100
   3 @@ -1,8 +1,10 @@
   4  #! /bin/sh
   5
   6 +export PATH="$PATH:/opt/QtPalmtop/bin"
   7 +
   8  OPIE_SH=/opt/QtPalmtop/bin/opie-sh
   9  OPIE_DIR=/opt/QtPalmtop
  10 -OPIE_COMPAT=runcompat
  11 +OPIE_COMPAT=/opt/QtPalmtop/bin/runcompat
  12  OPIE_TMP=/tmp
  13
  14  about() {
  15 @@ -31,6 +33,10 @@
  16  }
  17
  18  ask_list() {
  19 +
  20 +        rm $OPIE_TMP/mc.names
  21 +       rm $OPIE_TMP/mc.map
  22 +
  23         # Figure out which app groups are
  24         GROUP=`ls $OPIE_DIR/apps \
  25                 | grep -v Setting \
  26 @@ -38,39 +44,55 @@
  27                 | $OPIE_SH -g -i -M "Select which group" -l -F \
  28                 | sed -e"s/Pim/1Pim/g"`
  29
  30 +       echo -e "\n\n---------- DEBUGGING OUTPUT ----------\n"
  31 +
  32         for i in $OPIE_DIR/apps/$GROUP/*.desktop ; do
  33                 # Extract the name and what is run
  34 -               EXEC=`grep "Exec=" $i | sed -e"s/.*=//g`
  35 -               NAME=`grep "Name=" $i | sed -e"s/.*=//g`
  36 +               EXEC="`egrep "Exec.*=" $i | sed -e "s/.*=//g"| sed "s/^\ //"`"
  37 +               NAME="`egrep "Name.*=" $i | head -1 | sed -e "s/.*=//g"| sed "s/^\ //"`"
  38
  39                 # Where is the file actually located?
  40                 # This doesnt handle spaces.
  41                 FOUND="false"
  42 -               for j in `echo $PATH | sed -e"s/:/ /g"`; do
  43 -                       if [ -x $j/$EXEC ]; then
  44 +               #echo -e "* * [$i] [$NAME] [$EXEC]\n\n"
  45 +               for j in `echo $PATH | sed -e "s/:/ /g"`; do
  46 +               #                     echo "* * * teste [$j]/$EXEC"
  47 +                       if [ -x "$j/$EXEC" ]; then
  48                                 EXEC="$j/$EXEC"
  49                                 FOUND="true"
  50 +                       #       echo "* * * * found $NAME"
  51                                 break
  52                         fi
  53                 done
  54
  55                 # Did we find the object?
  56                 if [ "$FOUND" = "false" ]; then
  57 -                       echo "Could not find $EXEC in path"
  58 +                       echo -e "* * * * [$EXEC] not found in path"
  59                         continue
  60                 fi
  61
  62 -               echo $NAME >> $OPIE_TMP/mc.names
  63 -               echo $NAME=$EXEC >> $OPIE_TMP/mc.map
  64 +               echo "$NAME" >> $OPIE_TMP/mc.names
  65 +               echo "$NAME=$EXEC" >> $OPIE_TMP/mc.map
  66
  67         done
  68 -
  69 -       SELECTION=`cat $OPIE_TMP/mc.names | $OPIE_SH -g -i -M "Select which application" -l -F`
  70 +
  71 +       echo -e "\n--------------------------------------\n\n"
  72 +
  73 +       SELECTION=`cat $OPIE_TMP/mc.names | $OPIE_SH -g -i -M "Select which application" -l -F`
  74         LOCATION=`grep "$SELECTION" $OPIE_TMP/mc.map | sed -e"s/.*=//g"`
  75
  76         rm $OPIE_TMP/mc.names
  77         rm $OPIE_TMP/mc.map
  78
  79 +                        # User aborted
  80 +                       if test -z "$SELECTION"
  81 +                       then
  82 +                                echo "User aborted"
  83 +                                cleanup
  84 +                                exit 1
  85 +                       fi
  86 +
  87 +
  88         return
  89  }
  90
  91 @@ -112,7 +134,7 @@
  92  }
  93
  94  is_compat() {
  95 -       if [ "`ls -l \"$1\" | sed -e\"s/.*-> //g\"`" = "$OPIE_COMPAT" ]; then
  96 +       if [ "`ls -l \"$1\" | sed -e \"s/.*-> //g\"`" = "$OPIE_COMPAT" ]; then
  97                 echo "Is already linked to compat lib"
  98                 return 1
  99         else