Switch to domain yt-dl.org

diff --git a/devscripts/gh-pages/add-version.py b/devscripts/gh-pages/add-version.py
index 6af8bb9d84196b92a9b5162b52173741ffd31b0c..116420ef2f0e4561a07ce558590088b418872179 100755 (executable)
--- a/devscripts/gh-pages/add-version.py
+++ b/devscripts/gh-pages/add-version.py
@@ -6,28 +6,32 @@ import hashlib
 import urllib.request
 
 if len(sys.argv) <= 1:
-       print('Specify the version number as parameter')
-       sys.exit()
+    print('Specify the version number as parameter')
+    sys.exit()
 version = sys.argv[1]
 
 with open('update/LATEST_VERSION', 'w') as f:
-       f.write(version)
+    f.write(version)
 
 versions_info = json.load(open('update/versions.json'))
 if 'signature' in versions_info:
-       del versions_info['signature']
+    del versions_info['signature']
 
 new_version = {}
 
-filenames = {'bin': 'youtube-dl', 'exe': 'youtube-dl.exe', 'tar': 'youtube-dl-%s.tar.gz' % version}
+filenames = {
+    'bin': 'youtube-dl',
+    'exe': 'youtube-dl.exe',
+    'tar': 'youtube-dl-%s.tar.gz' % version}
 for key, filename in filenames.items():
-       print('Downloading and checksumming %s...' %filename)
-       url = 'http://youtube-dl.org/downloads/%s/%s' % (version, filename)
-       data = urllib.request.urlopen(url).read()
-       sha256sum = hashlib.sha256(data).hexdigest()
-       new_version[key] = (url, sha256sum)
+    print('Downloading and checksumming %s...' % filename)
+    url = 'https://yt-dl.org/downloads/%s/%s' % (version, filename)
+    data = urllib.request.urlopen(url).read()
+    sha256sum = hashlib.sha256(data).hexdigest()
+    new_version[key] = (url, sha256sum)
 
 versions_info['versions'][version] = new_version
 versions_info['latest'] = version
 
-json.dump(versions_info, open('update/versions.json', 'w'), indent=4, sort_keys=True)
\ No newline at end of file
+with open('update/versions.json', 'w') as jsonf:
+    json.dump(versions_info, jsonf, indent=4, sort_keys=True)

diff --git a/devscripts/gh-pages/update-feed.py b/devscripts/gh-pages/update-feed.py
index cfff05fc8f017cac11bc0293ca60734040127c39..16571a924c132b8ba7849ea9ad81a4d63c6ed208 100755 (executable)
--- a/devscripts/gh-pages/update-feed.py
+++ b/devscripts/gh-pages/update-feed.py
@@ -22,7 +22,7 @@ entry_template=textwrap.dedent("""
                                                                        <atom:link href="http://rg3.github.io/youtube-dl" />
                                                                        <atom:content type="xhtml">
                                                                                <div xmlns="http://www.w3.org/1999/xhtml">
-                                                                                       Downloads available at <a href="http://youtube-dl.org/downloads/@VERSION@/">http://youtube-dl.org/downloads/@VERSION@/</a>
+                                                                                       Downloads available at <a href="https://yt-dl.org/downloads/@VERSION@/">https://yt-dl.org/downloads/@VERSION@/</a>
                                                                                </div>
                                                                        </atom:content>
                                                                        <atom:author>
@@ -54,4 +54,3 @@ atom_template = atom_template.replace('@ENTRIES@', entries_str)
 with open('update/releases.atom','w',encoding='utf-8') as atom_file:
        atom_file.write(atom_template)
 
-

diff --git a/devscripts/release.sh b/devscripts/release.sh
index 46c31e437558659d734d4f59009eadcd94ca62c0..24c9ad8d889808ac5e2d25b7ab2c8b5ff3db7ef5 100755 (executable)
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -67,7 +67,7 @@ RELEASE_FILES="youtube-dl youtube-dl.exe youtube-dl-$version.tar.gz"
 (cd build/$version/ && sha512sum $RELEASE_FILES > SHA2-512SUMS)
 git checkout HEAD -- youtube-dl youtube-dl.exe
 
-/bin/echo -e "\n### Signing and uploading the new binaries to youtube-dl.org..."
+/bin/echo -e "\n### Signing and uploading the new binaries to yt-dl.org ..."
 for f in $RELEASE_FILES; do gpg --detach-sig "build/$version/$f"; done
 scp -r "build/$version" ytdl@yt-dl.org:html/tmp/
 ssh ytdl@yt-dl.org "mv html/tmp/$version html/downloads/"