Changeset 198 for trunk/LocationDo


Ignore:
Timestamp:
11/09/05 18:15:40 (14 years ago)
Author:
Nicholas Riley
Message:

LocationDo?.py: ssh to yt in 4111; 1320 AP works for 1310/1320

action.py: fix killall on vpnc to actually work

props: ignore build, dist directories

Location:
trunk/LocationDo
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LocationDo

    • Property svn:ignore
      •  

        old new  
        11brightness
        22*.pyc
         3build
         4dist
  • trunk/LocationDo/LocationDo.py

    r196 r198  
    7070    if '4111 SC' in location:
    7171        action.openInBackground('~/Documents/MSSP/MSSP progress.oo3')
     72        action.terminalDo('kswitch -p njriley@ACM.UIUC.EDU;(sleep 10;kswitch -p njriley@AD.UIUC.EDU)&!;clear;ssh yt')
    7273        action.setDisplayBrightnessPercent(0.9)
    7374        action.setAdiumStatus('Working in 4111 SC')
     
    8081        action.setVolumePercent(0.5)
    8182        action.setAdiumStatus('At home')
    82     if '1320 DCL' in location:
     83    if '13[12]0 DCL' in location:
    8384        action.setDisplayBrightnessPercent(0.2)
    8485        action.setVolumePercent(0)
    85         action.setAdiumStatus('In 1320 DCL')
     86        action.setAdiumStatus('In 13[12]0 DCL')
    8687    if 'UIUCnet' in location:
    8788        action.startVPNC('UIUCnet-oncampus')
     
    140141                        location.add('Champaign')
    141142                    elif bssid == '00:13:c4:ce:66:a0':
    142                         location.add('1320 DCL')
     143                        location.add('13[12]0 DCL')
    143144                    elif bssid in ['00:14:1c:ad:5c:80', '00:14:1c:ad:64:50']:
    144145                        location.add('MEB')
  • trunk/LocationDo/action.py

    r196 r198  
    7272
    7373def stopVPNC():
    74     authorizationDo('/usr/bin/killall', 'vpnc')
     74    # killall uses your uid, not your euid to determine which user's
     75    # processes to kill; without '-u root', this fails
     76    authorizationDo('/usr/bin/killall', '-u', 'root', 'vpnc')
    7577
    7678def startVPNC(vpncProfile=None):
Note: See TracChangeset for help on using the changeset viewer.