Changeset 7cc2c1e


Ignore:
Timestamp:
2010-04-12T15:37:33Z (10 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
72b60c7e
Parents:
e3781b9
Message:

skyped: use os.path.expanduser for file paths in config

Requested-by: ilf <ilf@…>

Location:
skype
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • skype/skyped.py

    re3781b9 r7cc2c1e  
    279279        options.config.username = options.config.get('skyped', 'username').split('#')[0]
    280280        options.config.password = options.config.get('skyped', 'password').split('#')[0]
    281         options.config.sslkey = options.config.get('skyped', 'key').split('#')[0]
    282         options.config.sslcert = options.config.get('skyped', 'cert').split('#')[0]
     281        options.config.sslkey = os.path.expanduser(options.config.get('skyped', 'key').split('#')[0])
     282        options.config.sslcert = os.path.expanduser(options.config.get('skyped', 'cert').split('#')[0])
    283283        # hack: we have to parse the parameters first to locate the
    284284        # config file but the -p option should overwrite the value from
  • skype/t/livetest-bitlbee.sh

    re3781b9 r7cc2c1e  
    2828echo "username = $TEST_SKYPE_ID" >> skyped.conf
    2929echo "password = $(echo -n $TEST_SKYPE_PASSWORD|sha1sum|sed 's/ *-$//')" >> skyped.conf
    30 echo "cert = $(pwd)/etc/skyped.cert.pem" >> skyped.conf
    31 echo "key = $(pwd)/etc/skyped.key.pem" >> skyped.conf
     30# we use ~ here to test that resolve that syntax works
     31echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf
     32echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf
    3233echo "port = 2727" >> skyped.conf
    3334
Note: See TracChangeset for help on using the changeset viewer.