From 11f19906592d422ee4f320a28527499e4c4a85a4 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 6 Aug 2017 14:59:08 +0200
Subject: Initial commit

---
 al32-mktorrent.sh | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 al32-mktorrent.sh

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
new file mode 100644
index 0000000..65ba794
--- /dev/null
+++ b/al32-mktorrent.sh
@@ -0,0 +1,71 @@
+#! /bin/bash
+set -euo pipefail
+
+function join_by { local IFS="$1"; shift; echo "$*"; }
+
+usage () {
+	echo "Usage: $0 [i686|dual]"
+}
+
+if [ "$#" -eq 0 ] ; then 
+	echo "No architecture specified, selecting 'i686'"
+	arch="i686"
+elif [ "$#" -eq 1 ] ; then
+	echo "Selecting architecture '$1'"
+	arch="$1"
+else
+	usage
+	echo "Too many arguments, exiting" >&2
+	exit 1
+fi
+
+fg_green="\033[32m"
+fg_red="\033[31m"
+fg_blue="\033[34m"
+fg_reset="\033[0m"
+fg_bold="\033[1m"
+
+MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
+
+mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
+
+declare -a available_mirrors
+
+read -r -p "Date of the ISO: " iso_date
+
+iso_string="archlinux-$iso_date-$arch.iso"
+
+for i in $mirrorlist ; do
+	echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
+	curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
+		echo -e "$fg_reset${fg_green}OK$fg_reset"
+	) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
+	available_mirrors=(${available_mirrors[@]} "$i")
+done
+
+echo "${#available_mirrors[@]} mirrors available"
+
+
+if [ ! -f "$iso_string" ] ; then
+	echo -e "$fg_reset${fg_bold}Downloading iso...$fg_reset"
+	curl -O "${available_mirrors[0]}$iso_string"
+else
+	echo -e "$fg_reset${fg_bold}Reusing already downloaded iso...$fg_reset"
+fi
+
+
+echo -e "$fg_reset${fg_bold}Downloading verification files...$fg_reset"
+curl -O "${available_mirrors[0]}$iso_string.sig"
+curl -O "${available_mirrors[0]}sha512sums"
+
+echo -n -e "$fg_reset${fg_bold}Checking PGP signature...$fg_reset "
+gpg --verify "$iso_string.sig" "$iso_string" || exit 100
+echo -e "$fg_reset${fg_green}OK"
+
+echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
+sha512sum --ignore-missing --check sha512sums || exit 101
+
+echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
+mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string" 
+
+# vim: set ts=4 sw=4:
-- 
cgit v1.2.3-54-g00ecf


From cc28ea695f9afe6e7524e9b5ba6877f5e5c477d2 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 6 Aug 2017 15:50:10 +0200
Subject: Show magnet link

---
 al32-mktorrent.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 65ba794..005ac13 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -66,6 +66,11 @@ echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
 sha512sum --ignore-missing --check sha512sums || exit 101
 
 echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
+if [ -f "$iso_string.torrent" ] ; then
+	rm "$iso_string.torrent"
+fi
 mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string" 
 
+echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
+transmission-show --magnet "$iso_string.torrent"
 # vim: set ts=4 sw=4:
-- 
cgit v1.2.3-54-g00ecf


From 6a7214ed114a3c68b8c0f75aab3c2ab41e35f8ed Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 6 Aug 2017 15:50:39 +0200
Subject: Use the options for the date

---
 al32-mktorrent.sh | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 005ac13..34607b7 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -4,21 +4,9 @@ set -euo pipefail
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
 usage () {
-	echo "Usage: $0 [i686|dual]"
+	echo "Usage: $0 [-d date] [i686|dual]"
 }
 
-if [ "$#" -eq 0 ] ; then 
-	echo "No architecture specified, selecting 'i686'"
-	arch="i686"
-elif [ "$#" -eq 1 ] ; then
-	echo "Selecting architecture '$1'"
-	arch="$1"
-else
-	usage
-	echo "Too many arguments, exiting" >&2
-	exit 1
-fi
-
 fg_green="\033[32m"
 fg_red="\033[31m"
 fg_blue="\033[34m"
@@ -30,8 +18,33 @@ MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/c
 mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
 
 declare -a available_mirrors
+iso_date=''
+
+while getopts "u:p:t:f:d:" o; do
+    case "${o}" in
+        d)
+            iso_date=${OPTARG}
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+shift $((OPTIND-1))
 
-read -r -p "Date of the ISO: " iso_date
+[ -z "$iso_date" ] && read -r -p "Date of the ISO: " iso_date
+
+if [ "$#" -eq 0 ] ; then 
+	echo "No architecture specified, selecting 'i686'"
+	arch="i686"
+elif [ "$#" -eq 1 ] ; then
+	echo "Selecting architecture '$1'"
+	arch="$1"
+else
+	usage
+	echo "Too many arguments, exiting" >&2
+	exit 1
+fi
 
 iso_string="archlinux-$iso_date-$arch.iso"
 
-- 
cgit v1.2.3-54-g00ecf


From eeb3193ff0e16fb989e0c2d8d5912010f4c4eddb Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 6 Aug 2017 16:09:20 +0200
Subject: Add LICENSE and README

---
 LICENSE           | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md         |  29 +++
 al32-mktorrent.sh |  13 ++
 3 files changed, 716 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

(limited to 'al32-mktorrent.sh')

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..1c050f5
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# al32-mktorrent
+
+Torrent creation script for [ArchLinux32](https://archlinux32.org)
+
+## Usage
+
+    al32-mktorrent.sh [ -d date ] [ i686 | dual ]
+
+If no architecture is specified, the script will default to `i686`.
+If no date is specified, the script will prompt for a date during the process.
+
+## License
+
+> This program is free software: you can redistribute it and/or modify
+> it under the terms of the GNU General Public License as published by
+> the Free Software Foundation, either version 3 of the License, or
+> (at your option) any later version.
+>
+> This program is distributed in the hope that it will be useful,
+> but WITHOUT ANY WARRANTY; without even the implied warranty of
+> MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+> GNU General Public License for more details.
+>
+> You should have received a copy of the GNU General Public License
+> along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+## Author
+
+Copyright (c) 2017 Simon Doppler (dopsi)
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 34607b7..6843a9a 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -1,3 +1,16 @@
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 #! /bin/bash
 set -euo pipefail
 
-- 
cgit v1.2.3-54-g00ecf


From 4d238ce495f298921b086fc76dfde9465fc1bb8d Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 6 Aug 2017 20:51:08 +0200
Subject: Improve options handling

---
 al32-mktorrent.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 6843a9a..1103364 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -28,17 +28,20 @@ fg_bold="\033[1m"
 
 MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
 
-mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
-
 declare -a available_mirrors
 iso_date=''
 
-while getopts "u:p:t:f:d:" o; do
+while getopts "d:h" o; do
     case "${o}" in
         d)
             iso_date=${OPTARG}
             ;;
+        h)
+            usage
+			exit
+            ;;
         *)
+			echo "$0: unknown option ${o}" >&2
             usage
             ;;
     esac
@@ -47,6 +50,8 @@ shift $((OPTIND-1))
 
 [ -z "$iso_date" ] && read -r -p "Date of the ISO: " iso_date
 
+mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
+
 if [ "$#" -eq 0 ] ; then 
 	echo "No architecture specified, selecting 'i686'"
 	arch="i686"
-- 
cgit v1.2.3-54-g00ecf


From 60eb998226809b43bec8e47ab729c5fa6898c90d Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 7 Aug 2017 16:33:12 +0200
Subject: Create feed from magnet links

---
 README.md         |  2 +-
 al32-mktorrent.sh |  7 ++++++-
 magnet2feed.py    | 30 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 magnet2feed.py

(limited to 'al32-mktorrent.sh')

diff --git a/README.md b/README.md
index 38b80df..427daca 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ If no date is specified, the script will prompt for a date during the process.
   * [ ] Upload the torrent file to a server via SSH (for sharing)
   * [ ] Upload the torrent to transmission-server
 * [ ] Inform the world of the new torrent file
-  * [ ] Add the magnet link to a RSS feed
+  * [x] Add the magnet link to a RSS feed
   * [ ] Upload the new RSS feed to the server
   * [ ] Send an email to the arch-ports list
 
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 1103364..3fdb196 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -103,5 +103,10 @@ fi
 mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string" 
 
 echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
-transmission-show --magnet "$iso_string.torrent"
+magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
+echo "$magnet_link"
+
+echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
+python magnet2feed.py "$magnet_link" "$iso_date"
+
 # vim: set ts=4 sw=4:
diff --git a/magnet2feed.py b/magnet2feed.py
new file mode 100644
index 0000000..5dc767f
--- /dev/null
+++ b/magnet2feed.py
@@ -0,0 +1,30 @@
+from feedgenerator import Rss201rev2Feed
+import sys
+from os.path import basename
+
+feed_url = 'https://static.dopsi.ch/al32/feed_{arch}.rss'
+architectures = ['i686', 'dual']
+
+
+def main(link, date):
+    for arch in architectures:
+        feed = Rss201rev2Feed(title='ArchLinux32 torrent download feed ({arch} ISO)'.format(arch=arch),
+                              link=feed_url,
+                              description="A torrent feed to download the latest ArchLinux32 {arch} iso".format(
+                                  arch=arch
+                              ),
+                              language='en')
+
+        feed.add_item(title='ArchLinux32 {arch} {date}'.format(arch=arch, date=date),
+                      link=link,
+                      description='ArchLinux32 {arch} {date}'.format(arch=arch, date=date))
+
+        with open(basename(feed_url).format(arch=arch), mode='w') as feed_file:
+            feed.write(feed_file, 'utf-8')
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 3:
+        print('Error: {cmd} magnet date'.format(cmd=sys.argv[0]))
+
+    main(link=sys.argv[1], date=sys.argv[2])
-- 
cgit v1.2.3-54-g00ecf


From f43000503280370733138fdd311b18936a92d452 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 7 Aug 2017 17:06:13 +0200
Subject: Build both architectures at the same time

---
 README.md         |   7 ++-
 al32-mktorrent.sh | 125 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 70 insertions(+), 62 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/README.md b/README.md
index 427daca..24c8fa7 100644
--- a/README.md
+++ b/README.md
@@ -4,20 +4,19 @@ Torrent creation script for [ArchLinux32](https://archlinux32.org)
 
 ## Usage
 
-    al32-mktorrent.sh [ -d date ] [ i686 | dual ]
+    al32-mktorrent.sh [ -d date ]
 
-If no architecture is specified, the script will default to `i686`.
 If no date is specified, the script will prompt for a date during the process.
 
 ## Features
 
-* [ ] Torrent creation
+* [x] Torrent creation
   * [x] Create a torrent file per architecture
     * [x] Obtain the latest mirrorlist
     * [x] Check mirrors for ISO availability
     * [x] Download ISO
     * [x] Check ISO
-  * [ ] Create both torrent files at once
+  * [x] Create both torrent files at once
   * [x] Create a magnet link per architecture
 * [ ] Torrent upload
   * [ ] Upload the torrent file to a server via SSH (for sharing)
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 3fdb196..3c1090a 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -17,7 +17,7 @@ set -euo pipefail
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
 usage () {
-	echo "Usage: $0 [-d date] [i686|dual]"
+	echo "Usage: $0 [-d date]"
 }
 
 fg_green="\033[32m"
@@ -28,6 +28,70 @@ fg_bold="\033[1m"
 
 MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
 
+function create_torrent_for_arch () {
+    mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
+
+    if [ "$#" -eq 0 ] ; then
+        echo "No architecture specified, selecting 'i686'"
+        arch="i686"
+    elif [ "$#" -eq 1 ] ; then
+        echo "Selecting architecture '$1'"
+        arch="$1"
+    else
+        usage
+        echo "Too many arguments, exiting" >&2
+        exit 1
+    fi
+
+    iso_string="archlinux-$iso_date-$arch.iso"
+
+    for i in $mirrorlist ; do
+        echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
+        curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
+            echo -e "$fg_reset${fg_green}OK$fg_reset"
+        ) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
+        available_mirrors=(${available_mirrors[@]} "$i")
+    done
+
+    echo "${#available_mirrors[@]} mirrors available"
+
+
+    if [ ! -f "$iso_string" ] ; then
+        echo -e "$fg_reset${fg_bold}Downloading iso...$fg_reset"
+        curl -O "${available_mirrors[0]}$iso_string"
+    else
+        echo -e "$fg_reset${fg_bold}Reusing already downloaded iso...$fg_reset"
+    fi
+
+
+    echo -e "$fg_reset${fg_bold}Downloading verification files...$fg_reset"
+    curl -O "${available_mirrors[0]}$iso_string.sig"
+    curl -O "${available_mirrors[0]}sha512sums"
+
+    echo -n -e "$fg_reset${fg_bold}Checking PGP signature...$fg_reset "
+    gpg --verify "$iso_string.sig" "$iso_string" || exit 100
+    echo -e "$fg_reset${fg_green}OK"
+
+    echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
+    sha512sum --ignore-missing --check sha512sums || exit 101
+
+    echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
+    if [ -f "$iso_string.torrent" ] ; then
+        rm "$iso_string.torrent"
+    fi
+    mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string"
+
+    echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
+    magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
+    echo "$magnet_link"
+
+    echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
+    python magnet2feed.py "$magnet_link" "$iso_date"
+}
+
+### Actual program
+
+declare -a architectures=("i686" "dual")
 declare -a available_mirrors
 iso_date=''
 
@@ -50,63 +114,8 @@ shift $((OPTIND-1))
 
 [ -z "$iso_date" ] && read -r -p "Date of the ISO: " iso_date
 
-mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
-
-if [ "$#" -eq 0 ] ; then 
-	echo "No architecture specified, selecting 'i686'"
-	arch="i686"
-elif [ "$#" -eq 1 ] ; then
-	echo "Selecting architecture '$1'"
-	arch="$1"
-else
-	usage
-	echo "Too many arguments, exiting" >&2
-	exit 1
-fi
-
-iso_string="archlinux-$iso_date-$arch.iso"
-
-for i in $mirrorlist ; do
-	echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
-	curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
-		echo -e "$fg_reset${fg_green}OK$fg_reset"
-	) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
-	available_mirrors=(${available_mirrors[@]} "$i")
+for a in "${architectures[@]}" ; do
+	create_torrent_for_arch "$a"
 done
 
-echo "${#available_mirrors[@]} mirrors available"
-
-
-if [ ! -f "$iso_string" ] ; then
-	echo -e "$fg_reset${fg_bold}Downloading iso...$fg_reset"
-	curl -O "${available_mirrors[0]}$iso_string"
-else
-	echo -e "$fg_reset${fg_bold}Reusing already downloaded iso...$fg_reset"
-fi
-
-
-echo -e "$fg_reset${fg_bold}Downloading verification files...$fg_reset"
-curl -O "${available_mirrors[0]}$iso_string.sig"
-curl -O "${available_mirrors[0]}sha512sums"
-
-echo -n -e "$fg_reset${fg_bold}Checking PGP signature...$fg_reset "
-gpg --verify "$iso_string.sig" "$iso_string" || exit 100
-echo -e "$fg_reset${fg_green}OK"
-
-echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
-sha512sum --ignore-missing --check sha512sums || exit 101
-
-echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
-if [ -f "$iso_string.torrent" ] ; then
-	rm "$iso_string.torrent"
-fi
-mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string" 
-
-echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
-magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
-echo "$magnet_link"
-
-echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
-python magnet2feed.py "$magnet_link" "$iso_date"
-
 # vim: set ts=4 sw=4:
-- 
cgit v1.2.3-54-g00ecf


From ed9232d04bb4b8fd175f6c3002cf4fd265c17af2 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 7 Aug 2017 17:12:05 +0200
Subject: Do not duplicate mirrors on the second run

---
 al32-mktorrent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 3c1090a..b5aaff7 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -29,6 +29,7 @@ fg_bold="\033[1m"
 MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
 
 function create_torrent_for_arch () {
+    declare -a available_mirrors
     mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
 
     if [ "$#" -eq 0 ] ; then
@@ -92,7 +93,6 @@ function create_torrent_for_arch () {
 ### Actual program
 
 declare -a architectures=("i686" "dual")
-declare -a available_mirrors
 iso_date=''
 
 while getopts "d:h" o; do
-- 
cgit v1.2.3-54-g00ecf


From 01578696cb5b8fc18f36f1b639399c9c3c0ead36 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Tue, 8 Aug 2017 12:37:59 +0200
Subject: All architecture selection

---
 README.md         | 3 ++-
 al32-mktorrent.sh | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/README.md b/README.md
index 066aeee..9cc69ee 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@ along with the RSS feeds (for [i686](https://static.dopsi.ch/al32/feed_i686.rss)
 
 ## Usage
 
-    al32-mktorrent.sh [ -d date ]
+    al32-mktorrent.sh [ -d date ] [ arch... ]
 
+If no arch is specified both `i686` and `dual` will be generated.
 If no date is specified, the script will prompt for a date during the process.
 
 ## Features
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index b5aaff7..68ea265 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -17,7 +17,7 @@ set -euo pipefail
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
 usage () {
-	echo "Usage: $0 [-d date]"
+	echo "Usage: $0 [-d date] [arch...]"
 }
 
 fg_green="\033[32m"
@@ -112,6 +112,10 @@ while getopts "d:h" o; do
 done
 shift $((OPTIND-1))
 
+if [ "$#" -gt 0 ] ; then
+	architectures=($@)
+fi
+
 [ -z "$iso_date" ] && read -r -p "Date of the ISO: " iso_date
 
 for a in "${architectures[@]}" ; do
-- 
cgit v1.2.3-54-g00ecf


From 7e38635cf035af09a17864146b3701ea104c29df Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Tue, 8 Aug 2017 12:44:27 +0200
Subject: Clean up directory before building new files

---
 al32-mktorrent.sh | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 68ea265..d4c5d19 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -28,6 +28,11 @@ fg_bold="\033[1m"
 
 MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
 
+function cleanup () {
+    echo -n -e "$fg_reset${fg_bold}Cleaning up directory...$fg_reset "
+	rm -f archlinux-2017.08.01-dual.iso.sig archlinux-2017.08.01-dual.iso.torrent archlinux-2017.08.01-i686.iso.sig archlinux-2017.08.01-i686.iso.torrent feed_dual.rss feed_i686.rss sha512sums
+}
+
 function create_torrent_for_arch () {
     declare -a available_mirrors
     mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
@@ -118,6 +123,8 @@ fi
 
 [ -z "$iso_date" ] && read -r -p "Date of the ISO: " iso_date
 
+cleanup
+
 for a in "${architectures[@]}" ; do
 	create_torrent_for_arch "$a"
 done
-- 
cgit v1.2.3-54-g00ecf


From dff3af881cb53d000ff1cf9a26ed732f58869acf Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 3 Sep 2017 19:17:35 +0200
Subject: Check for missing programs

---
 al32-mktorrent.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index d4c5d19..3190f0c 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -95,6 +95,18 @@ function create_torrent_for_arch () {
     python magnet2feed.py "$magnet_link" "$iso_date"
 }
 
+### Check for if required programs are present
+
+which mktorrent 2>/dev/null || (
+	echo "Missing mktorrent"
+	exit 1
+)
+
+python -c "import feedgenerator" 2>/dev/null || (
+	echo "Missing python module feedgenerator"
+	exit 1
+)
+
 ### Actual program
 
 declare -a architectures=("i686" "dual")
-- 
cgit v1.2.3-54-g00ecf


From 5303d8c8b0c72914e62c97f8237bc9c853fe6eac Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 4 Sep 2017 18:39:27 +0200
Subject: Handle upload of files to hefur and a web server

---
 README.md         | 16 ++++++++++------
 al32-mktorrent.sh | 31 +++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 8 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/README.md b/README.md
index 7332da6..c1a7cbc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # al32-mktorrent
 
-Torrent creation script for [ArchLinux32](https://archlinux32.org)
+Torrent creation script for [ArchLinux32](https://archlinux32.org), with upload
+capabilities via `scp` and to [hefur](https://github.com/abique/hefur).
 
 The latest torrents are hosted on [static.dopsi.ch](https://static.dopsi.ch/al32/)
 along with the RSS feeds (for [i686](https://static.dopsi.ch/al32/feed_i686.rss) and
@@ -8,10 +9,12 @@ along with the RSS feeds (for [i686](https://static.dopsi.ch/al32/feed_i686.rss)
 
 ## Usage
 
-    al32-mktorrent.sh [ -d date ] [ arch... ]
+    al32-mktorrent.sh [ -d date ] [ -w webdir ] [ -t hefurdir ] [ arch... ]
 
-If no arch is specified both `i686` and `dual` will be generated.
-If no date is specified, the script will prompt for a date during the process.
+If no `arch` is specified both `i686` and `dual` will be generated.
+If no `date` is specified, the script will prompt for a date during the process.
+If `hefurdir` or `webdir` is not specified no file will be uploaded to 
+the corresponding server.
 
 ## Features
 
@@ -24,11 +27,12 @@ If no date is specified, the script will prompt for a date during the process.
     * [x] Create both torrent files at once
     * [x] Create a magnet link per architecture
   * [ ] Torrent upload
-    * [ ] Upload the torrent file to a server via SSH (for sharing)
+    * [x] Upload the torrent file to a web server via SSH
+    * [x] Upload the torrent file to a torrent tracker via SSH
     * [ ] Upload the torrent to transmission-server
   * [ ] Inform the world of the new torrent file
     * [x] Add the magnet link to a RSS feed
-    * [ ] Upload the new RSS feed to the server
+    * [x] Upload the new RSS feed to the server
     * [ ] Send an email to the arch-ports list
 
 ## License
diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 3190f0c..26f068d 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -17,7 +17,7 @@ set -euo pipefail
 function join_by { local IFS="$1"; shift; echo "$*"; }
 
 usage () {
-	echo "Usage: $0 [-d date] [arch...]"
+	echo "Usage: $0 [-d date] [-w webdir] [-t hefurdir] [arch...]"
 }
 
 fg_green="\033[32m"
@@ -95,6 +95,13 @@ function create_torrent_for_arch () {
     python magnet2feed.py "$magnet_link" "$iso_date"
 }
 
+function upload_file_to_remote_dir {
+	if [ -f "$1" ] && [ -n "$2" ] ; then
+        echo -e "$fg_reset${fg_bold}Uploading file$fg_reset "${fg_blue}$1$fg_reset" ${fg_bold}to$fg_reset "${fg_blue}$1$fg_reset" $fg_bold...$fg_reset"
+		scp "$1" "$2"
+	fi
+}
+
 ### Check for if required programs are present
 
 which mktorrent 2>/dev/null || (
@@ -111,12 +118,20 @@ python -c "import feedgenerator" 2>/dev/null || (
 
 declare -a architectures=("i686" "dual")
 iso_date=''
+web_dir=''
+hefur_dir=''
 
-while getopts "d:h" o; do
+while getopts "d:w:t:h" o; do
     case "${o}" in
         d)
             iso_date=${OPTARG}
             ;;
+        t)
+            hefur_dir=${OPTARG}
+            ;;
+        w)
+            web_dir=${OPTARG}
+            ;;
         h)
             usage
 			exit
@@ -141,4 +156,16 @@ for a in "${architectures[@]}" ; do
 	create_torrent_for_arch "$a"
 done
 
+for a in "${architectures[@]}" ; do
+    torrent_filename="archlinux-$iso_date-$arch.iso.torrent"
+	if [ -n "$web_dir" ] ; then
+		feed_filename="feed_$arch.rss"
+		upload_file_to_remote_dir "$torrent_filename" "$web_dir"
+		upload_file_to_remote_dir "$feed_filename" "$web_dir"
+	fi
+	if [ -n "$hefur_dir" ] ; then
+		upload_file_to_remote_dir "$torrent_filename" "$hefur_dir"
+	fi
+done
+
 # vim: set ts=4 sw=4:
-- 
cgit v1.2.3-54-g00ecf


From 3c1c5f7fd21a67d650d5906fe2d6ff1248de1903 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 4 Sep 2017 19:00:00 +0200
Subject: Delete unused files

---
 al32-mktorrent.sh | 160 +++++++++++++++++++++++++++---------------------------
 1 file changed, 80 insertions(+), 80 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 26f068d..f6b697e 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -29,75 +29,75 @@ fg_bold="\033[1m"
 MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/core/pacman-mirrorlist/mirrorlist"
 
 function cleanup () {
-    echo -n -e "$fg_reset${fg_bold}Cleaning up directory...$fg_reset "
-	rm -f archlinux-2017.08.01-dual.iso.sig archlinux-2017.08.01-dual.iso.torrent archlinux-2017.08.01-i686.iso.sig archlinux-2017.08.01-i686.iso.torrent feed_dual.rss feed_i686.rss sha512sums
+	echo -n -e "$fg_reset${fg_bold}Cleaning up directory...$fg_reset "
+	rm -f *.sig *.torrent *.rss sha512sums
 }
 
 function create_torrent_for_arch () {
-    declare -a available_mirrors
-    mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
-
-    if [ "$#" -eq 0 ] ; then
-        echo "No architecture specified, selecting 'i686'"
-        arch="i686"
-    elif [ "$#" -eq 1 ] ; then
-        echo "Selecting architecture '$1'"
-        arch="$1"
-    else
-        usage
-        echo "Too many arguments, exiting" >&2
-        exit 1
-    fi
-
-    iso_string="archlinux-$iso_date-$arch.iso"
-
-    for i in $mirrorlist ; do
-        echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
-        curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
-            echo -e "$fg_reset${fg_green}OK$fg_reset"
-        ) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
-        available_mirrors=(${available_mirrors[@]} "$i")
-    done
-
-    echo "${#available_mirrors[@]} mirrors available"
-
-
-    if [ ! -f "$iso_string" ] ; then
-        echo -e "$fg_reset${fg_bold}Downloading iso...$fg_reset"
-        curl -O "${available_mirrors[0]}$iso_string"
-    else
-        echo -e "$fg_reset${fg_bold}Reusing already downloaded iso...$fg_reset"
-    fi
-
-
-    echo -e "$fg_reset${fg_bold}Downloading verification files...$fg_reset"
-    curl -O "${available_mirrors[0]}$iso_string.sig"
-    curl -O "${available_mirrors[0]}sha512sums"
-
-    echo -n -e "$fg_reset${fg_bold}Checking PGP signature...$fg_reset "
-    gpg --verify "$iso_string.sig" "$iso_string" || exit 100
-    echo -e "$fg_reset${fg_green}OK"
-
-    echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
-    sha512sum --ignore-missing --check sha512sums || exit 101
-
-    echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
-    if [ -f "$iso_string.torrent" ] ; then
-        rm "$iso_string.torrent"
-    fi
-    mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string"
-
-    echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
-    magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
-    echo "$magnet_link"
-
-    echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
-    python magnet2feed.py "$magnet_link" "$iso_date"
+	declare -a available_mirrors
+	mirrorlist="$(curl "$MIRRORLIST_FILE" 2>/dev/null | grep Server | cut -d '=' -f 2 | sed -e 's/\s//g;s_$arch/$repo_archisos/_')"
+
+	if [ "$#" -eq 0 ] ; then
+		echo "No architecture specified, selecting 'i686'"
+		arch="i686"
+	elif [ "$#" -eq 1 ] ; then
+		echo "Selecting architecture '$1'"
+		arch="$1"
+	else
+		usage
+		echo "Too many arguments, exiting" >&2
+		exit 1
+	fi
+
+	iso_string="archlinux-$iso_date-$arch.iso"
+
+	for i in $mirrorlist ; do
+		echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
+		curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
+			echo -e "$fg_reset${fg_green}OK$fg_reset"
+		) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
+		available_mirrors=(${available_mirrors[@]} "$i")
+	done
+
+	echo "${#available_mirrors[@]} mirrors available"
+
+
+	if [ ! -f "$iso_string" ] ; then
+		echo -e "$fg_reset${fg_bold}Downloading iso...$fg_reset"
+		curl -O "${available_mirrors[0]}$iso_string"
+	else
+		echo -e "$fg_reset${fg_bold}Reusing already downloaded iso...$fg_reset"
+	fi
+
+
+	echo -e "$fg_reset${fg_bold}Downloading verification files...$fg_reset"
+	curl -O "${available_mirrors[0]}$iso_string.sig"
+	curl -O "${available_mirrors[0]}sha512sums"
+
+	echo -n -e "$fg_reset${fg_bold}Checking PGP signature...$fg_reset "
+	gpg --verify "$iso_string.sig" "$iso_string" || exit 100
+	echo -e "$fg_reset${fg_green}OK"
+
+	echo -e "$fg_reset${fg_bold}Checking SHA512 sums...$fg_reset"
+	sha512sum --ignore-missing --check sha512sums || exit 101
+
+	echo -e "$fg_reset${fg_bold}Create torrent file...$fg_reset"
+	if [ -f "$iso_string.torrent" ] ; then
+		rm "$iso_string.torrent"
+	fi
+	mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string"
+
+	echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
+	magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
+	echo "$magnet_link"
+
+	echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
+	python magnet2feed.py "$magnet_link" "$iso_date"
 }
 
 function upload_file_to_remote_dir {
 	if [ -f "$1" ] && [ -n "$2" ] ; then
-        echo -e "$fg_reset${fg_bold}Uploading file$fg_reset "${fg_blue}$1$fg_reset" ${fg_bold}to$fg_reset "${fg_blue}$1$fg_reset" $fg_bold...$fg_reset"
+		echo -e "$fg_reset${fg_bold}Uploading file$fg_reset "${fg_blue}$1$fg_reset" ${fg_bold}to$fg_reset "${fg_blue}$1$fg_reset" $fg_bold...$fg_reset"
 		scp "$1" "$2"
 	fi
 }
@@ -122,25 +122,25 @@ web_dir=''
 hefur_dir=''
 
 while getopts "d:w:t:h" o; do
-    case "${o}" in
-        d)
-            iso_date=${OPTARG}
-            ;;
-        t)
-            hefur_dir=${OPTARG}
-            ;;
-        w)
-            web_dir=${OPTARG}
-            ;;
-        h)
-            usage
+	case "${o}" in
+		d)
+			iso_date=${OPTARG}
+			;;
+		t)
+			hefur_dir=${OPTARG}
+			;;
+		w)
+			web_dir=${OPTARG}
+			;;
+		h)
+			usage
 			exit
-            ;;
-        *)
+			;;
+		*)
 			echo "$0: unknown option ${o}" >&2
-            usage
-            ;;
-    esac
+			usage
+			;;
+	esac
 done
 shift $((OPTIND-1))
 
@@ -157,7 +157,7 @@ for a in "${architectures[@]}" ; do
 done
 
 for a in "${architectures[@]}" ; do
-    torrent_filename="archlinux-$iso_date-$arch.iso.torrent"
+	torrent_filename="archlinux-$iso_date-$arch.iso.torrent"
 	if [ -n "$web_dir" ] ; then
 		feed_filename="feed_$arch.rss"
 		upload_file_to_remote_dir "$torrent_filename" "$web_dir"
-- 
cgit v1.2.3-54-g00ecf


From b335dfa09811806bed1cf2891ed5ffa88d471f09 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Mon, 4 Sep 2017 19:10:06 +0200
Subject: Add check for transmission-show

---
 al32-mktorrent.sh | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index f6b697e..994820f 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -114,6 +114,11 @@ python -c "import feedgenerator" 2>/dev/null || (
 	exit 1
 )
 
+which transmission-show 2>/dev/null || (
+	echo "Missing transmission-show"
+	exit 1
+)
+
 ### Actual program
 
 declare -a architectures=("i686" "dual")
-- 
cgit v1.2.3-54-g00ecf


From 066a53bb91275b8d130913e2b54fbb09278eb145 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 8 Oct 2017 16:02:35 +0200
Subject: Update torrent filename

---
 al32-mktorrent.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 994820f..1d9d7c2 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -162,9 +162,9 @@ for a in "${architectures[@]}" ; do
 done
 
 for a in "${architectures[@]}" ; do
-	torrent_filename="archlinux-$iso_date-$arch.iso.torrent"
+	torrent_filename="archlinux-$iso_date-$a.iso.torrent"
 	if [ -n "$web_dir" ] ; then
-		feed_filename="feed_$arch.rss"
+		feed_filename="feed_$a.rss"
 		upload_file_to_remote_dir "$torrent_filename" "$web_dir"
 		upload_file_to_remote_dir "$feed_filename" "$web_dir"
 	fi
-- 
cgit v1.2.3-54-g00ecf


From 9800ba434829ec3f782c4c8ed1ee7faa6d240dae Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sun, 8 Oct 2017 16:05:13 +0200
Subject: Remove annoying messages

---
 al32-mktorrent.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 1d9d7c2..45ba288 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -104,7 +104,7 @@ function upload_file_to_remote_dir {
 
 ### Check for if required programs are present
 
-which mktorrent 2>/dev/null || (
+which mktorrent 2>&1 >/dev/null || (
 	echo "Missing mktorrent"
 	exit 1
 )
@@ -114,7 +114,7 @@ python -c "import feedgenerator" 2>/dev/null || (
 	exit 1
 )
 
-which transmission-show 2>/dev/null || (
+which transmission-show 2>&1 >/dev/null || (
 	echo "Missing transmission-show"
 	exit 1
 )
-- 
cgit v1.2.3-54-g00ecf


From c3add10fe87cc2a2a33de3bbf5f5eafc4ef7a8f4 Mon Sep 17 00:00:00 2001
From: Simon Doppler <dopsi@dopsi.ch>
Date: Sat, 14 Oct 2017 13:57:23 +0200
Subject: Run shellcheck

---
 al32-mktorrent.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 45ba288..3049514 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -30,7 +30,7 @@ MIRRORLIST_FILE="https://raw.githubusercontent.com/archlinux32/packages/master/c
 
 function cleanup () {
 	echo -n -e "$fg_reset${fg_bold}Cleaning up directory...$fg_reset "
-	rm -f *.sig *.torrent *.rss sha512sums
+	rm -f ./*.sig ./*.torrent ./*.rss sha512sums
 }
 
 function create_torrent_for_arch () {
@@ -97,7 +97,7 @@ function create_torrent_for_arch () {
 
 function upload_file_to_remote_dir {
 	if [ -f "$1" ] && [ -n "$2" ] ; then
-		echo -e "$fg_reset${fg_bold}Uploading file$fg_reset "${fg_blue}$1$fg_reset" ${fg_bold}to$fg_reset "${fg_blue}$1$fg_reset" $fg_bold...$fg_reset"
+		echo -e "$fg_reset${fg_bold}Uploading file$fg_reset ${fg_blue}$1$fg_reset ${fg_bold}to$fg_reset ${fg_blue}$1$fg_reset $fg_bold...$fg_reset"
 		scp "$1" "$2"
 	fi
 }
-- 
cgit v1.2.3-54-g00ecf


From 7ea752bf045c6256d396af7bccebb1a5a899f2a3 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 19 Jul 2019 13:47:27 +0200
Subject: al32-mktorrent.sh: add timeout to curl

---
 al32-mktorrent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 3049514..3e577c4 100644
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -53,7 +53,7 @@ function create_torrent_for_arch () {
 
 	for i in $mirrorlist ; do
 		echo -n -e "$fg_reset${fg_bold}Checking $fg_reset$fg_blue$i$fg_reset "
-		curl -g "$i" 2>/dev/null | grep -q "$iso_string" && (
+		curl --connect-timeout 10 -g "$i" 2>/dev/null | grep -q "$iso_string" && (
 			echo -e "$fg_reset${fg_green}OK$fg_reset"
 		) || ( echo -e "$fg_reset${fg_red}Failed$fg_reset" ; false ) || continue
 		available_mirrors=(${available_mirrors[@]} "$i")
-- 
cgit v1.2.3-54-g00ecf


From 4a43f66c8fdd36fe72d85dbfce8dd2fcc5f5a06d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 19 Jul 2019 13:47:36 +0200
Subject: al32-mktorrent.sh: make executable

---
 al32-mktorrent.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 al32-mktorrent.sh

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3-54-g00ecf


From 261a5bcd58279a084bf20dc313b6665be391b046 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 19 Jul 2019 13:47:51 +0200
Subject: al32-mktorrent.sh: make executable from everywhere

---
 al32-mktorrent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 3e577c4..0abdab9 100755
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -92,7 +92,7 @@ function create_torrent_for_arch () {
 	echo "$magnet_link"
 
 	echo -e "$fg_reset${fg_bold}Create RSS feed files...$fg_reset"
-	python magnet2feed.py "$magnet_link" "$iso_date"
+	python "${0%/*}/magnet2feed.py" "$magnet_link" "$iso_date"
 }
 
 function upload_file_to_remote_dir {
-- 
cgit v1.2.3-54-g00ecf


From f39a7ec765dc05e04b315d538634140f7f323398 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 19 Jul 2019 13:48:05 +0200
Subject: al32-mktorrent.sh: change tracker url to our own

---
 al32-mktorrent.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'al32-mktorrent.sh')

diff --git a/al32-mktorrent.sh b/al32-mktorrent.sh
index 0abdab9..6c01aff 100755
--- a/al32-mktorrent.sh
+++ b/al32-mktorrent.sh
@@ -85,7 +85,7 @@ function create_torrent_for_arch () {
 	if [ -f "$iso_string.torrent" ] ; then
 		rm "$iso_string.torrent"
 	fi
-	mktorrent --announce=http://dopsi.ch:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string"
+	mktorrent --announce=http://archlinux32.org:6969/announce --web-seed="$(join_by ',' "${available_mirrors[@]}")" "$iso_string"
 
 	echo -e "$fg_reset${fg_bold}Create magnet link...$fg_reset"
 	magnet_link="$(transmission-show --magnet "$iso_string.torrent")"
-- 
cgit v1.2.3-54-g00ecf