From ddde3194d869e6689ce16c5404fd4fd9039834b7 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 19 Dec 2015 22:22:45 +0100 Subject: [PATCH] Adapting satellites for new freshnaut --- astronaut/hello.sat | 13 +++++++++++++ satellites/bin/ctrulib.sat | 1 + satellites/bin/default_arm7.sat | 1 + satellites/bin/devkitarm.sat | 1 + satellites/bin/libfat-nds.sat | 1 + satellites/bin/libnds.sat | 1 + satellites/bin/palemoon.sat | 2 +- satellites/python3.4-crc16.sat | 2 +- satellites/python3.4-websocket-client.sat | 2 +- satellites/qwbfsmanager.sat | 3 ++- satellites/speedtest-cli.sat | 2 +- satellites/vcs/ctr.sat | 2 +- 12 files changed, 25 insertions(+), 6 deletions(-) diff --git a/astronaut/hello.sat b/astronaut/hello.sat index 80bfbab..a90e250 100644 --- a/astronaut/hello.sat +++ b/astronaut/hello.sat @@ -3,13 +3,23 @@ import "say_hello" # Import some functions. See functions/say_hello.sh for more info. # Info (Please declare it, as it will be used outside of this script, too) +# Required info name=hello # Name of the software, not the package name. # Same source files will be used for the same software, despite the package name being different. version=2.10 + +# Optional info update_url="https://ftp.gnu.org/gnu/$name/" # URL to a downloadable plain-text file which updates when a new version is available. +update_names="$name-$version.tar.gz" # Specify what the lines containing the version number look like on the download page. + # It's a comma-separated list, and can contain multiple entries. + # Every entry must contain at least one instance of $version, + # as another program will look for any different versions on the same page. + # You may not need to set this, in which case the program will try to guess it from the download commands. vcs_compile=true # Set this to true if it's a vcs package, and we've just downloaded an update for it. This is meant to be used in functions/header_end hooks, and has to be set before header_end is called (or by a header_end hook). +# Please note that setting the above info from an imported script is supported, as long as it's done in the header. + # Astronaut will generally prefix internal variables with "_". There are, however, a few exceptions. # Some of those you can touch, some not. # "You shouldn't even look, unless you're hacking really bad, but definitely don't touch"-variables: @@ -49,7 +59,10 @@ header_end # End of the header. # - dlextract # - dlfile # - extrafile +# - import # getfile and extract are technically allowed, but not encouraged. +# Basically, do not use anything that touches dir_build or dir_install or does anything other than fetching the required files. +# The same rule above applies for imported commands. # Name [REQUIRED], Destination, Custom command extract "$name-$version.tar.gz" \ diff --git a/satellites/bin/ctrulib.sat b/satellites/bin/ctrulib.sat index cc85259..391f1c3 100644 --- a/satellites/bin/ctrulib.sat +++ b/satellites/bin/ctrulib.sat @@ -2,6 +2,7 @@ name=ctrulib libname=libctru version=1.0.0 update_url="https://sourceforge.net/projects/devkitpro/files/$libname/" +update_names="" download "https://sourceforge.net/projects/devkitpro/files/$libname/$version/$libname-$version.tar.bz2" \ "c1c817a56fe091bb20a58e5cffe967c0" diff --git a/satellites/bin/default_arm7.sat b/satellites/bin/default_arm7.sat index 0ab04d3..30241a7 100644 --- a/satellites/bin/default_arm7.sat +++ b/satellites/bin/default_arm7.sat @@ -2,6 +2,7 @@ name=default_arm7 libname=libnds version=0.6.0 update_url="https://sourceforge.net/projects/devkitpro/files/default arm7/" +update_names="" download "https://sourceforge.net/projects/devkitpro/files/default arm7/$version/$name-$version.tar.bz2" \ "11cf9d749c3d346ca35c5d586364fad3" diff --git a/satellites/bin/devkitarm.sat b/satellites/bin/devkitarm.sat index fd13691..0be4a85 100644 --- a/satellites/bin/devkitarm.sat +++ b/satellites/bin/devkitarm.sat @@ -1,6 +1,7 @@ name=devkitARM version=r45 update_url="https://sourceforge.net/projects/devkitpro/files/$name/" +update_names="/$name/${name}_$version/" download "https://sourceforge.net/projects/devkitpro/files/$name/${name}_$version/${name}_$version-x86_64-linux.tar.bz2" \ "660dd47bae0e4b70a0a649b4bc833e33" diff --git a/satellites/bin/libfat-nds.sat b/satellites/bin/libfat-nds.sat index 7eb2e14..26b4ee0 100644 --- a/satellites/bin/libfat-nds.sat +++ b/satellites/bin/libfat-nds.sat @@ -2,6 +2,7 @@ name=libfat-nds libname=libnds version=1.0.14 update_url="https://sourceforge.net/projects/devkitpro/files/libfat/" +update_names="" download "https://sourceforge.net/projects/devkitpro/files/libfat/$version/$name-$version.tar.bz2" \ "cc1712a56c8b0c133974936c69599f0e" diff --git a/satellites/bin/libnds.sat b/satellites/bin/libnds.sat index a0af61e..5bacd42 100644 --- a/satellites/bin/libnds.sat +++ b/satellites/bin/libnds.sat @@ -1,6 +1,7 @@ name=libnds version=1.5.12 update_url="https://sourceforge.net/projects/devkitpro/files/$name/" +update_names="" download "https://sourceforge.net/projects/devkitpro/files/$name/$version/$name-$version.tar.bz2" \ "49f4e8dfee73c3fd9897cf314eb6d359" diff --git a/satellites/bin/palemoon.sat b/satellites/bin/palemoon.sat index f3fd6a9..0d7e788 100644 --- a/satellites/bin/palemoon.sat +++ b/satellites/bin/palemoon.sat @@ -2,7 +2,7 @@ name=palemoon version=25.8.1 update_url="https://linux.palemoon.org/download/mainline/" -download "https://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x86_64.tar.bz2" \ +download "http://linux.palemoon.org/files/$version/$name-$version.en-US.linux-x86_64.tar.bz2" \ "fcd7fdf3e91c77cdfafdbfec6582a7e8" extrafile "palemoon.desktop" header_end diff --git a/satellites/python3.4-crc16.sat b/satellites/python3.4-crc16.sat index 284bfc6..f99de87 100644 --- a/satellites/python3.4-crc16.sat +++ b/satellites/python3.4-crc16.sat @@ -2,7 +2,7 @@ import "compile/python" name=pycrc16 version=0.1.1 -update_url="https://api.github.com/repos/gennady/$name/tags" +update_url="https://github.com/gennady/$name/releases" dlextract "https://github.com/gennady/$name/archive/v$version.tar.gz" \ "0e6432cea6cd71a151cfe7fba96b67c9" diff --git a/satellites/python3.4-websocket-client.sat b/satellites/python3.4-websocket-client.sat index 9ee2dc7..5dc93fc 100644 --- a/satellites/python3.4-websocket-client.sat +++ b/satellites/python3.4-websocket-client.sat @@ -2,7 +2,7 @@ import "compile/python" name=websocket-client version=0.34.0 -update_url="https://api.github.com/repos/liris/$name/tags" +update_url="https://github.com/liris/$name/releases" dlextract "https://github.com/liris/$name/archive/v$version.tar.gz" \ "d7b222cb75877a5ddd5a0260f09af2e6" diff --git a/satellites/qwbfsmanager.sat b/satellites/qwbfsmanager.sat index 49a60e7..2078a46 100644 --- a/satellites/qwbfsmanager.sat +++ b/satellites/qwbfsmanager.sat @@ -4,7 +4,8 @@ import "download/git" name=qwbfsmanager version=1.2.5 -update_url="https://api.github.com/repos/pasnox/$name/tags" +update_url="https://github.com/pasnox/$name/releases" +update_names="v$version.tar.gz" # Downloading this way to get dependencies. download_git "https://github.com/pasnox/$name" "v$version" diff --git a/satellites/speedtest-cli.sat b/satellites/speedtest-cli.sat index d626b5f..ffb902d 100644 --- a/satellites/speedtest-cli.sat +++ b/satellites/speedtest-cli.sat @@ -2,7 +2,7 @@ import "compile/python" name=speedtest-cli version=0.3.4 -update_url="https://api.github.com/repos/sivel/$name/tags" +update_url="https://github.com/sivel/$name/releases" dlextract "https://github.com/sivel/$name/archive/v$version.tar.gz" \ "45344501fab5e19492ae3ef1de4ed9ae" diff --git a/satellites/vcs/ctr.sat b/satellites/vcs/ctr.sat index 95ba222..a23ec80 100644 --- a/satellites/vcs/ctr.sat +++ b/satellites/vcs/ctr.sat @@ -2,7 +2,7 @@ import "vcs/git" name=ctr -vcs_git "https://github.com/b1l1s/$name" +vcs_git "https://github.com/b1l1s/$name" header_end cd "$name"