diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2010-04-12 17:37:33 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2010-04-12 17:37:33 +0200 |
| commit | 7cc2c1ef13822cf37cfe82cbea03127b74d546a0 (patch) | |
| tree | e031e3cb736f80c11aa0adc248b9563cfa200a5e | |
| parent | e3781b931db87a3ea03ebed6b4818cf6c7d55b98 (diff) | |
skyped: use os.path.expanduser for file paths in config
Requested-by: ilf <ilf@gmx.net>
| -rw-r--r-- | skype/skyped.py | 4 | ||||
| -rwxr-xr-x | skype/t/livetest-bitlbee.sh | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/skype/skyped.py b/skype/skyped.py index 2e483f08..9c6a1e61 100644 --- a/skype/skyped.py +++ b/skype/skyped.py @@ -278,8 +278,8 @@ if __name__=='__main__': options.config.read(options.cfgpath) options.config.username = options.config.get('skyped', 'username').split('#')[0] options.config.password = options.config.get('skyped', 'password').split('#')[0] - options.config.sslkey = options.config.get('skyped', 'key').split('#')[0] - options.config.sslcert = options.config.get('skyped', 'cert').split('#')[0] + options.config.sslkey = os.path.expanduser(options.config.get('skyped', 'key').split('#')[0]) + options.config.sslcert = os.path.expanduser(options.config.get('skyped', 'cert').split('#')[0]) # hack: we have to parse the parameters first to locate the # config file but the -p option should overwrite the value from # the config file diff --git a/skype/t/livetest-bitlbee.sh b/skype/t/livetest-bitlbee.sh index dc3a1009..cf2450e2 100755 --- a/skype/t/livetest-bitlbee.sh +++ b/skype/t/livetest-bitlbee.sh @@ -27,8 +27,9 @@ cd .. echo "[skyped]" > skyped.conf echo "username = $TEST_SKYPE_ID" >> skyped.conf echo "password = $(echo -n $TEST_SKYPE_PASSWORD|sha1sum|sed 's/ *-$//')" >> skyped.conf -echo "cert = $(pwd)/etc/skyped.cert.pem" >> skyped.conf -echo "key = $(pwd)/etc/skyped.key.pem" >> skyped.conf +# we use ~ here to test that resolve that syntax works +echo "cert = $(pwd|sed "s|$HOME|~|")/etc/skyped.cert.pem" >> skyped.conf +echo "key = $(pwd|sed "s|$HOME|~|")/etc/skyped.key.pem" >> skyped.conf echo "port = 2727" >> skyped.conf # Run skyped |