unity/scripts/jigdofy_everything_spin.sh | 59 ++++++++++++++++++++++++++++ unity/scripts/jigdofy_single-cd_spin.sh | 59 ++++++++++++++++++++++++++++ unity/scripts/torrentify_everything_spin.sh | 40 ++++++++++++++++++ unity/scripts/torrentify_single-cd_spin.sh | 36 +++++++++++++++++ 4 files changed, 194 insertions(+)
New commits: commit e4859b28b19c251a7a7326db11dd2bb2ea2339bb Merge: 0164351... 55ec139... Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Sat Jul 18 22:32:04 2009 +0200
Merge branch 'master' of ssh://git.kanarip.com/srv/git/revisor
commit 55ec139c564a0c464556e0eb508adc8965eb78d0 Merge: b66718a... 59e08a0... Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Sat Jul 18 21:41:29 2009 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/revisor
commit b66718a703938715b18adfb010ea73f226810050 Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Sat Jul 18 21:40:39 2009 +0200
Fix jigdofy_single-cd_spin.sh
diff --git a/unity/scripts/jigdofy_single-cd_spin.sh b/unity/scripts/jigdofy_single-cd_spin.sh index dc969d2..f3b7ceb 100755 --- a/unity/scripts/jigdofy_single-cd_spin.sh +++ b/unity/scripts/jigdofy_single-cd_spin.sh @@ -55,5 +55,5 @@ done ##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM
sed -i -e "s/+/%2b/g" $jigdofile -sed -i -e "s/Template=F/Template=http://jigdo.fedoraunity.org/templates/${datestamp}/F/g" $jigdofile +sed -i -e "s/Template=F/Template=http://jigdo.fedoraunity.org/templates/Fedora-${version}-Single-CD/F/g" $jigdofile
commit 79c10471b5d439027a8a9cc3434742030b8d5b30 Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Sun Jun 21 13:34:19 2009 +0200
Add new scripts
diff --git a/unity/scripts/jigdofy_everything_spin.sh b/unity/scripts/jigdofy_everything_spin.sh new file mode 100755 index 0000000..989eb3a --- /dev/null +++ b/unity/scripts/jigdofy_everything_spin.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +function jigdofy() { + jigdo-file make-template \ + --image=$1 \ + /data/os/distr/fedora/releases/${version}/Fedora/$2/os// \ + /data/os/distr/fedora/releases/${version}/Everything/$2/os// \ + --label "Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os" \ + --uri "Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/l..." \ + --label "Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \ + --uri "Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/l..." \ + --jigdo=$jigdofile \ + --template=/var/www/jigdo/templates/Fedora-${version}-Everything/`basename $1`.template \ + --force --merge=$jigdofile \ + --cache=${jigdofile}.cache +} + +export archs="" +export JIGDOFY_SOURCE_ISO=0 + +while [ $# -gt 0 ]; do + case $1 in + --version) + export version=$2 + shift; shift + ;; + --arch) + export archs="${archs} $2" + shift; shift + ;; + esac +done + +if [ -z "$version" ]; then + echo Usage: $0 --version [version] --arch [arch1] [[--arch [arch2]] [--arch [arch3]]] + exit 1 +fi + +export jigdofile=/var/www/jigdo/templates/Fedora-${version}-Everything/Fedora-${version}-Everything.jigdo +export product_dir=/data/revisor/ + +[ ! -d /var/www/jigdo/data/Fedora-${version}-Everything ] && mkdir -p /var/www/jigdo/data/Fedora-${version}-Everything +[ ! -d /var/www/jigdo/templates/Fedora-${version}-Everything ] && mkdir -p /var/www/jigdo/templates/Fedora-${version}-Everything + +[ ! -f ${jigdofile} ] && touch ${jigdofile} + +for arch in ${archs}; do + for iso in `ls ${product_dir}/f${version}-$arch-everything/iso/*.iso`; do + jigdofy $iso $arch + done + cat ${product_dir}/f${version}-$arch-everything/iso/SHA1SUM >> /var/www/jigdo/templates/Fedora-${version}-Everything/Fedora-${version}-Everything.SHA1SUM +done + +## Grab sha1sums +##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM + +sed -i -e "s/+/%2b/g" $jigdofile +sed -i -e "s/Template=F/Template=http://jigdo.fedoraunity.org/templates/${datestamp}/F/g" $jigdofile + diff --git a/unity/scripts/jigdofy_single-cd_spin.sh b/unity/scripts/jigdofy_single-cd_spin.sh new file mode 100755 index 0000000..dc969d2 --- /dev/null +++ b/unity/scripts/jigdofy_single-cd_spin.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +function jigdofy() { + jigdo-file make-template \ + --image=$1 \ + /data/os/distr/fedora/releases/${version}/Fedora/$2/os// \ + /data/os/distr/fedora/releases/${version}/Everything/$2/os// \ + --label "Fedora-$2"="/data/os/distr/fedora/releases/${version}/Fedora/$2/os" \ + --uri "Fedora-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/l..." \ + --label "Everything-$2"="/data/os/distr/fedora/releases/${version}/Everything/$2/os" \ + --uri "Everything-$2"="http://mirrors.fedoraproject.org/mirrorlist?redirect=1&path=pub/fedora/l..." \ + --jigdo=$jigdofile \ + --template=/var/www/jigdo/templates/Fedora-${version}-Single-CD/`basename $1`.template \ + --force --merge=$jigdofile \ + --cache=${jigdofile}.cache +} + +export archs="" +export JIGDOFY_SOURCE_ISO=0 + +while [ $# -gt 0 ]; do + case $1 in + --version) + export version=$2 + shift; shift + ;; + --arch) + export archs="${archs} $2" + shift; shift + ;; + esac +done + +if [ -z "$version" ]; then + echo Usage: $0 --version [version] --arch [arch1] [[--arch [arch2]] [--arch [arch3]]] + exit 1 +fi + +export jigdofile=/var/www/jigdo/templates/Fedora-${version}-Single-CD/Fedora-${version}-Single-CD.jigdo +export product_dir=/data/revisor/ + +[ ! -d /var/www/jigdo/data/Fedora-${version}-Single-CD ] && mkdir -p /var/www/jigdo/data/Fedora-${version}-Single-CD +[ ! -d /var/www/jigdo/templates/Fedora-${version}-Single-CD ] && mkdir -p /var/www/jigdo/templates/Fedora-${version}-Single-CD + +[ ! -f ${jigdofile} ] && touch ${jigdofile} + +for arch in ${archs}; do + for iso in `ls ${product_dir}/f${version}-$arch-single-cd/iso/*.iso`; do + jigdofy $iso $arch + done + cat ${product_dir}/f${version}-$arch-single-cd/iso/SHA1SUM >> /var/www/jigdo/templates/Fedora-${version}-Single-CD/Fedora-${version}-Single-CD.SHA1SUM +done + +## Grab sha1sums +##cat /srv/revisor/*/iso/SHA1SUM >> /var/www/jigdo/templates/${datestamp}/Fedora-Unity-${datestamp}-${version}.SHA1SUM + +sed -i -e "s/+/%2b/g" $jigdofile +sed -i -e "s/Template=F/Template=http://jigdo.fedoraunity.org/templates/${datestamp}/F/g" $jigdofile + diff --git a/unity/scripts/torrentify_everything_spin.sh b/unity/scripts/torrentify_everything_spin.sh new file mode 100755 index 0000000..4d462c0 --- /dev/null +++ b/unity/scripts/torrentify_everything_spin.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +TORRENTDIR=/data/bittorrent/ +REVISORDIR=/data/revisor/ + +while [ $# -gt 0 ]; do + case $1 in + --version) + VERSION=$2 + shift; shift + ;; + --arch) + ARCHES="$ARCHES $2" + shift; shift + ;; + --source) + SOURCE=1 + shift + ;; + --media) + MEDIATYPES="$MEDIATYPES $2" + shift; shift + ;; + esac +done + +for arch in $ARCHES; do + for media in $MEDIATYPES; do + mkdir -p $TORRENTDIR/Fedora-$VERSION-Everything-${arch}-${media}/ + ln -f $REVISORDIR/f${VERSION}-${arch}-everything/iso/*${media}*.iso $TORRENTDIR/Fedora-$VERSION-Everything-${arch}-${media}/ + [ "${media}" == "DVD" ] && rm -f $TORRENTDIR/Fedora-${VERSION}-Everything-${arch}-DVD/*DVD-DL* + ln -f $REVISORDIR/f${VERSION}-${arch}-everything/iso/SHA1SUM $TORRENTDIR/Fedora-$VERSION-Everything-${arch}-${media}/SHA1SUM + maketorrent-console --piece_size_pow2 19 \ + --tracker_name http://spinner.fedoraunity.org:6969/announce \ + --comment "Fedora $VERSION Everything ${arch} ${media}" \ + --target $TORRENTDIR/Fedora-$VERSION-Everything-${arch}-${media}.torrent \ + http://spinner.fedoraunity.org:6969/announce \ + $TORRENTDIR/Fedora-$VERSION-Everything-${arch}-${media}/; + done; +done diff --git a/unity/scripts/torrentify_single-cd_spin.sh b/unity/scripts/torrentify_single-cd_spin.sh new file mode 100755 index 0000000..20590e0 --- /dev/null +++ b/unity/scripts/torrentify_single-cd_spin.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +TORRENTDIR=/data/bittorrent/ +REVISORDIR=/data/revisor/ + +while [ $# -gt 0 ]; do + case $1 in + --version) + VERSION=$2 + shift; shift + ;; + --arch) + ARCHES="$ARCHES $2" + shift; shift + ;; + --source) + SOURCE=1 + shift + ;; + --media) + MEDIATYPES="$MEDIATYPES $2" + shift; shift + ;; + esac +done + +for arch in $ARCHES; do + mkdir -p $TORRENTDIR/Fedora-$VERSION-Single-CD-${arch}/ + ln $REVISORDIR/f${VERSION}-${arch}-single-cd/iso/* $TORRENTDIR/Fedora-$VERSION-Single-CD-${arch}/ + maketorrent-console --piece_size_pow2 19 \ + --tracker_name http://spinner.fedoraunity.org:6969/announce \ + --comment "Fedora $VERSION Single CD ${arch}" \ + --target $TORRENTDIR/Fedora-$VERSION-Single-CD-${arch}.torrent \ + http://spinner.fedoraunity.org:6969/announce \ + $TORRENTDIR/Fedora-$VERSION-Single-CD-${arch}/; +done;
revisor-devel@lists.stg.fedorahosted.org