Changeset 7cc2c1e

Timestamp:

2010-04-12T15:37:33Z (15 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:

• skyped.py (modified) (1 diff)
• t/livetest-bitlbee.sh (modified) (1 diff)

skype/skyped.py

@@ -279 +279 @@
         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

skype/t/livetest-bitlbee.sh

@@ -28 +28 @@
 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