Changeset 6af3e2a


Ignore:
Timestamp:
01/30/14 07:56:12 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
693241f
Parents:
e868526 (diff), c088725 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pc-updatemanager/pc-updatemanager

    r074bcb6 rc088725  
    445445  do 
    446446    pbi=`echo $line | cut -d ' ' -f 1` 
     447    user=`echo $line | cut -d ' ' -f 2` 
     448 
    447449    echo "Removing: ${pbi}" 
    448     pbi_delete $pbi >/dev/null 2>/dev/null 
    449     if [ $? -ne 0 ] ; then 
     450    if [ "$user" != "root" ] ; then 
     451      su $user -c "pbi_icon del-desktop $pbi" 
     452      su $user -c "pbi_icon del-menu $pbi" 
     453      su $user -c "pbi_icon del-mime $pbi" 
     454      su $user -c "pbi_icon del-pathlnk $pbi" 
     455      su $user -c "pbi_delete $pbi" 
     456      result=$? 
     457    else 
     458      pbi_icon del-desktop $pbi 
     459      pbi_icon del-menu $pbi 
     460      pbi_icon del-mime $pbi 
     461      pbi_icon del-pathlnk $pbi 
     462      pbi_delete $pbi >/dev/null 2>/dev/null 
     463      result=$? 
     464    fi 
     465    if [ $result -ne 0 ] ; then 
    450466       echo "Warning: Failed to remove: $pbi" 
    451467       sleep 5 
     
    598614       echo "Press ENTER to continue" 
    599615       read tmp 
     616    else 
     617       # Re-add menu / desktop stuff 
     618       if [ "$user" != "root" ] ; then 
     619         su $user -c "pbi_icon add-pathlnk $shortpbi" 
     620         su $user -c "pbi_icon add-desktop $shortpbi" 
     621         su $user -c "pbi_icon add-menu $shortpbi" 
     622         su $user -c "pbi_icon add-mime $shortpbi" 
     623       else 
     624         pbi_icon add-pathlnk $shortpbi 
     625         pbi_icon add-desktop $shortpbi 
     626         pbi_icon add-menu $shortpbi 
     627         pbi_icon add-mime $shortpbi 
     628       fi 
    600629    fi 
    601630  done < /root/pcbsd-pbi-before-update 
  • build-files/conf/port-make.conf

    rea13527 re868526  
    7878kopete_SET=WEBCAM 
    7979libreoffice_SET=SYSTRAY 
     80libxine_SET=LIBBLURAY VAAPI WAVPACK SMB XVMC 
    8081linux-defcon_SET=NVIDIA 
    8182lyx_SET=ASPELL 
Note: See TracChangeset for help on using the changeset viewer.