diff options
author | Yorhel <git@yorhel.nl> | 2017-04-14 17:09:18 +0200 |
---|---|---|
committer | Yorhel <git@yorhel.nl> | 2017-04-14 17:09:18 +0200 |
commit | 72cb1ff184240ef44ce729cae505175ebd070f35 (patch) | |
tree | 3d6aa679c438cd74636686727b69493920ecb529 /util | |
parent | 34e8ee860328be5800eed267d3068f4c132cd3ae (diff) |
Add Ubuntu 17.04
Diffstat (limited to 'util')
-rw-r--r-- | util/common.sh | 8 | ||||
-rwxr-xr-x | util/ubuntu.sh | 13 |
2 files changed, 13 insertions, 8 deletions
diff --git a/util/common.sh b/util/common.sh index 4ba7f74..5644731 100644 --- a/util/common.sh +++ b/util/common.sh @@ -11,7 +11,6 @@ index() { # Convenient wrapper around index() for debian repos -# TODO: Use x86_64 for new releases # Usage: index_dev sys mirror distro list-of-components [contents] # contents: # empty for global Contents-i386.gz location @@ -22,11 +21,12 @@ index_deb() { local MIRROR=$2 local DISTRO=$3 local COMPONENTS=$4 - local CONTENTS=${5:-"dists/$DISTRO/Contents-i386.gz"} + local ARCH=${6:-"i386"} + local CONTENTS=${5:-"dists/$DISTRO/Contents-$ARCH.gz"} for CMP in $COMPONENTS; do local CONT=$CONTENTS - test $CONT = cmp && CONT="dists/$DISTRO/$CMP/Contents-i386.gz" - index deb --sys "$SYS" --mirror "$MIRROR" --contents "$MIRROR$CONT" --packages "${MIRROR}dists/$DISTRO/$CMP/binary-i386/Packages.gz" + test $CONT = cmp && CONT="dists/$DISTRO/$CMP/Contents-$ARCH.gz" + index deb --sys "$SYS" --mirror "$MIRROR" --contents "$MIRROR$CONT" --packages "${MIRROR}dists/$DISTRO/$CMP/binary-$ARCH/Packages.gz" done } diff --git a/util/ubuntu.sh b/util/ubuntu.sh index 97be7e2..b879d22 100755 --- a/util/ubuntu.sh +++ b/util/ubuntu.sh @@ -7,11 +7,12 @@ CMIRROR=http://nl.archive.ubuntu.com/ubuntu/ # Shortcut for a standard Ubuntu repo, usage: -# stdrepo name mirror +# stdrepo name mirror arch stdrepo() { - index_deb ubuntu-$1 $2 $1 "main multiverse restricted universe" - index_deb ubuntu-$1 $2 $1-updates "main multiverse restricted universe" - index_deb ubuntu-$1 $2 $1-security "main multiverse restricted universe" + local ARCH=${3:-"i386"} + index_deb ubuntu-$1 $2 $1 "main multiverse restricted universe" "" $ARCH + index_deb ubuntu-$1 $2 $1-updates "main multiverse restricted universe" "" $ARCH + index_deb ubuntu-$1 $2 $1-security "main multiverse restricted universe" "" $ARCH } @@ -100,6 +101,9 @@ case $1 in yakkety) stdrepo yakkety $CMIRROR ;; + zesty) + stdrepo zesty $CMIRROR amd64 + ;; old) $0 warty $0 hoary @@ -128,6 +132,7 @@ case $1 in $0 trusty # until 2019-04 $0 xenial # until 2021-04 $0 yakkety # until 2017-07 + $0 zesty # until 2018-01 ;; all) $0 old |