Changeset 2624 for pbibuild/modules

Show
Ignore:
Timestamp:
08/20/08 09:29:55 (3 months ago)
Author:
kris
Message:

Fixed up the mldonkey PBI module, should work properly now, and start mlnet
if needed before the GUI

Location:
pbibuild/modules/mldonkey
Files:
2 added
1 removed
4 modified

Legend:

Unmodified
Added
Removed

  • pbibuild/modules/mldonkey/kmenu-dir/mlgui

    r1044 r2624  
    1010ExeWebLink: 0 
    1111ExeTaskbar: 0 
    12 ExeOwndir: 2 
     12ExeOwndir: 1 
    1313ExeKdeCat: Internet 

  • pbibuild/modules/mldonkey/kmenu-dir/mlguistarter

    r1044 r2624  
    1010ExeWebLink: 0 
    1111ExeTaskbar: 0 
    12 ExeOwndir: 2 
     12ExeOwndir: 1 
    1313ExeKdeCat: Internet 

  • pbibuild/modules/mldonkey/overlay-dir/PBI.FirstRun.sh

    r1041 r2624  
    1818 
    1919 
    20 if [ -e "/usr/local/bin/digikam" ] 
     20if [ -e "/usr/local/bin/mlgui" ] 
    2121then 
    2222    # Looks like FF is installed, ask if they want to remove the old one 
    23     ls -al /usr/local/bin/digikam | grep Programs 2>/dev/null 
     23    ls -al /usr/local/bin/mlgui | grep Programs 2>/dev/null 
    2424    if [ "$?" = "0" ] 
    2525    then 
    … …  
    2727      if [ "$?" = "0" ] 
    2828      then 
    29         FF="`ls -al /usr/local/bin/digikam | cut -d '>' -f 2 | cut -d "/" -f 3`" 
    30         echo $FF | grep digiKam 2>/dev/null 
     29        FF="`ls -al /usr/local/bin/mlgui | cut -d '>' -f 2 | cut -d "/" -f 3`" 
     30        echo $FF | grep MLDonkey 2>/dev/null 
    3131        if [ "$?" = "0" ] 
    3232        then 
    3333          PBIdelete -remove ${FF} 
    3434        else 
    35           kdialog --sorry "digiKam could not be automatically removed... Please remove it in Add / Remove Programs and try again." 
     35          kdialog --sorry "MLDonkey could not be automatically removed... Please remove it in Add / Remove Programs and try again." 
    3636          return 2 
    3737        fi 
    3838      else 
    39         kdialog --sorry "digiKam is already installed, it must be uninstalled before loading this PBI" 
     39        kdialog --sorry "MLDonkey is already installed, it must be uninstalled before loading this PBI" 
    4040        return 2 
    4141      fi 
    … …  
    4343    else 
    4444      # Could not find a link to PBI folder 
    45       kdialog --sorry "digiKam is already installed, it must be uninstalled before loading this PBI" 
     45      kdialog --sorry "MLDonkey is already installed, it must be uninstalled before loading this PBI" 
    4646      return 2 
    4747    fi 

  • pbibuild/modules/mldonkey/pbi.conf

    r1041 r2624  
    3333# Build Key - Change this to anything else to trigger a rebuild  
    3434#           - The rebuild will take place even if port is still the same ver 
    35 BUILDKEY="01" 
     35BUILDKEY="21" 
    3636 
    3737export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY