From 19d6216088929e4e0a2d2b34bb43f009cb88ff03 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 9 Feb 2017 20:11:06 +0100
Subject: [PATCH] Add proper download names to github releases

I just found out it was possible, I think this is much nicer
---
 satellites/create_ap.sat            | 2 +-
 satellites/dolphin-emu.sat          | 2 +-
 satellites/libtorrent-rasterbar.sat | 2 +-
 satellites/maim.sat                 | 3 ++-
 satellites/mpv.sat                  | 3 ++-
 satellites/ninja.sat                | 3 ++-
 satellites/profile-sync-daemon.sat  | 3 ++-
 satellites/python3-cryptodome.sat   | 3 ++-
 satellites/python3-requests.sat     | 3 ++-
 satellites/python3-setuptools.sat   | 3 ++-
 satellites/slop.sat                 | 3 ++-
 satellites/yajl.sat                 | 2 +-
 12 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/satellites/create_ap.sat b/satellites/create_ap.sat
index 5bb443b..37772bd 100644
--- a/satellites/create_ap.sat
+++ b/satellites/create_ap.sat
@@ -3,7 +3,7 @@ version=0.4.6
 update_url="https://github.com/oblique/$name/releases"
 update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/oblique/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/oblique/$name/archive/v$version/$name-$version.tar.gz" \
           '4eaa1200204542670458cc7e9411b651'
 header_end
 
diff --git a/satellites/dolphin-emu.sat b/satellites/dolphin-emu.sat
index f5ebc1a..974f7bb 100644
--- a/satellites/dolphin-emu.sat
+++ b/satellites/dolphin-emu.sat
@@ -7,7 +7,7 @@ version=5.0
 update_url="https://github.com/$name/dolphin/releases"
 update_names="/archive/$version.tar.gz"
 
-dlextract "https://github.com/$name/dolphin/archive/$version.tar.gz" \
+dlextract "https://github.com/$name/dolphin/archive/$version/dolphin-$version.tar.gz" \
           'ed94272956adbec690808f6e4d8ff065'
 header_end
 
diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat
index 205c091..37d9360 100644
--- a/satellites/libtorrent-rasterbar.sat
+++ b/satellites/libtorrent-rasterbar.sat
@@ -4,7 +4,7 @@ name=libtorrent-rasterbar
 version=1.0.10
 update_url='https://github.com/arvidn/libtorrent/releases'
 
-dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | sed -e 's/\./_/g')/$name-$version.tar.gz" \
+dlextract "https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(echo "$version" | tr . _)/$name-$version.tar.gz" \
           'e917dc024e956e80d3d6ca19e40d7f42'
 header_end
 
diff --git a/satellites/maim.sat b/satellites/maim.sat
index c9a567e..9ab6410 100644
--- a/satellites/maim.sat
+++ b/satellites/maim.sat
@@ -3,8 +3,9 @@ import 'compile/cmake'
 name=maim
 version=3.4.47
 update_url="https://github.com/naelstrof/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/naelstrof/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           '5eab9c6fe147c7c3ff246fa764e7c2d1'
 header_end
 
diff --git a/satellites/mpv.sat b/satellites/mpv.sat
index 231b73a..518a001 100644
--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@@ -3,8 +3,9 @@ import 'compile/waf'
 name=mpv
 version=0.23.0
 update_url="https://github.com/mpv-player/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/mpv-player/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/mpv-player/$name/archive/v$version/$name-$version.tar.gz" \
           '9bce377e101612d611daf2a5c99aa95f'
 header_end
 
diff --git a/satellites/ninja.sat b/satellites/ninja.sat
index df11e41..284fdcb 100644
--- a/satellites/ninja.sat
+++ b/satellites/ninja.sat
@@ -1,10 +1,11 @@
 name=ninja
 version=1.7.2
 update_url="https://github.com/ninja-build/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
 define_option '!bootstrap: Bootstrap this program'
 
-dlextract "https://github.com/ninja-build/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/ninja-build/$name/archive/v$version/$name-$version.tar.gz" \
           '7b482218757acbaeac4d4d54a3cd94e1'
 header_end
 
diff --git a/satellites/profile-sync-daemon.sat b/satellites/profile-sync-daemon.sat
index 9c77db0..3903e53 100644
--- a/satellites/profile-sync-daemon.sat
+++ b/satellites/profile-sync-daemon.sat
@@ -1,8 +1,9 @@
 name=profile-sync-daemon
 version=6.31
 update_url="https://github.com/graysky2/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/graysky2/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/graysky2/$name/archive/v$version/$name-$version.tar.gz" \
           '159cabc39972be8d72e760a0025b5cd9'
 extrafile "$name-$version-fix-filenames-with-spaces.patch"
 header_end
diff --git a/satellites/python3-cryptodome.sat b/satellites/python3-cryptodome.sat
index c62b0e8..c23dc81 100644
--- a/satellites/python3-cryptodome.sat
+++ b/satellites/python3-cryptodome.sat
@@ -3,8 +3,9 @@ import 'compile/python'
 name=pycryptodome
 version=3.4.4
 update_url="https://github.com/Legrandin/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/Legrandin/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/Legrandin/$name/archive/v$version/$name-$version.tar.gz" \
           '00ed7ff323d91806b43f756389503dd3'
 header_end
 
diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat
index 075a7db..4441f8f 100644
--- a/satellites/python3-requests.sat
+++ b/satellites/python3-requests.sat
@@ -3,8 +3,9 @@ import 'compile/python'
 name=requests
 version=2.13.0
 update_url="https://github.com/kennethreitz/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/kennethreitz/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/kennethreitz/$name/archive/v$version/$name-$version.tar.gz" \
           '94ad79c2e57917aca999308b1fb4cbb4'
 header_end
 
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index be4c5e1..f9c8f7f 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -3,10 +3,11 @@ import 'compile/python'
 name=setuptools
 version=32.3.1
 update_url="https://github.com/pypa/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
 define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)'
 
-dlextract "https://github.com/pypa/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/pypa/$name/archive/v$version/$name-$version.tar.gz" \
           '8ba8280f8aa4451a7bca68947f09211e'
 header_end
 
diff --git a/satellites/slop.sat b/satellites/slop.sat
index 55b3ce7..03e4a2e 100644
--- a/satellites/slop.sat
+++ b/satellites/slop.sat
@@ -3,8 +3,9 @@ import 'compile/cmake'
 name=slop
 version=4.3.21
 update_url="https://github.com/naelstrof/$name/releases"
+update_names="/archive/v$version.tar.gz"
 
-dlextract "https://github.com/naelstrof/$name/archive/v$version.tar.gz" \
+dlextract "https://github.com/naelstrof/$name/archive/v$version/$name-$version.tar.gz" \
           '14feae4eed73470bf843c6d65dbb4dff'
 header_end
 
diff --git a/satellites/yajl.sat b/satellites/yajl.sat
index 410ff19..7c0602b 100644
--- a/satellites/yajl.sat
+++ b/satellites/yajl.sat
@@ -5,7 +5,7 @@ version=2.1.0
 update_url="https://github.com/lloyd/$name/releases"
 update_names="/archive/$version.tar.gz"
 
-dlextract "https://github.com/lloyd/$name/archive/$version.tar.gz" \
+dlextract "https://github.com/lloyd/$name/archive/$version/$name-$version.tar.gz" \
           '6887e0ed7479d2549761a4d284d3ecb0'
 header_end