unity/scripts/respin.sh | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
New commits:
commit 80ad40f24c02bddd0b7741756dde6942ba74bb4b
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Sun Mar 8 01:26:05 2009 +0100
Fix up the respin script some more
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index 6fc4c02..d4a018a 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -44,6 +44,9 @@ NOTIFICATION_FAILURE="test-team(a)lists.fedoraunity.org"
NOTIFICATION_SUCCESS="test-team(a)lists.fedoraunity.org"
NOTIFICATION_FROMADD="kanarip(a)kanarip.com"
+GIT_SPINKICKSTARTS=git://git.kanarip.com/spin-kickstarts
+GIT_REVISOR=git://git.kanarip.com/revisor
+
# The temp directory to use. Defaults to /tmp
#TMPDIR=/tmp
@@ -174,24 +177,13 @@ done
##
if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
- if [ "$0" != "${TMPDIR:-/tmp}/revisor/unity/scripts/respin.sh" ];
then
- if [ -d ${TMPDIR:-/tmp}/revisor ]; then
- cd ${TMPDIR:-/tmp}/revisor
- git checkout master
- git pull
git://git.fedorahosted.org/revisor master
- else
- git clone
git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor
- cd ${TMPDIR:-/tmp}/revisor
- fi
- else
- cd ${TMPDIR:-/tmp}/revisor
- fi
-
+ [ -d "${TMPDIR:-/tmp}/revisor" ] && rm -rf ${TMPDIR:-/tmp}/revisor
+ git clone ${GIT_REVISOR} ${TMPDIR:-/tmp}/revisor
+ cd ${TMPDIR:-/tmp}/revisor/
autoreconf -v && ./configure
./switchhere --yes
revisor_cmd="sudo ./revisor.py --cli"
revisor_cwd="${TMPDIR:-/tmp}/revisor/"
-
else
revisor_cmd="sudo revisor"
revisor_cwd="${TMPDIR:-/tmp}/"
@@ -206,13 +198,8 @@ fi
MESSAGE_END="\\n\\nThe size of the iso image is: %b.\\n\\nGo to
http://$WEB_HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind regards,\\n\\nJeroen van
Meeuwen\\n-kanarip"
# Cheat our way through spin-kickstarts
-if [ -d ${TMPDIR:-/tmp}/spin-kickstarts ]; then
- cd ${TMPDIR:-/tmp}/spin-kickstarts
- git checkout master
- git pull
git://git.fedorahosted.org/spin-kickstarts.git master
-else
- git clone
git://git.fedorahosted.org/spin-kickstarts.git
${TMPDIR:-/tmp}/spin-kickstarts
-fi
+[ -d ${TMPDIR:-/tmp}/spin-kickstarts ] && rm -rf ${TMPDIR:-/tmp}/spin-kickstarts
+git clone ${GIT_SPINKICKSTARTS} ${TMPDIR:-/tmp}/spin-kickstarts
for version in ${VERSIONS}; do
@@ -256,7 +243,7 @@ for version in ${VERSIONS}; do
[ $LIVE_LOCALIZED -eq 1 ] && \
spins=`${revisor_cmd} --config
/etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^
${real_version}-${arch}-" | awk '{print $1}'` || \
- spins=`${revisor_cmd} --config
/etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^
${real_version}-${arch}-" | awk '{print $1}' | grep -v _`
+ spins=`${revisor_cmd} --config
/etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^
${real_version}-${arch}-" | awk '{print $1}' | grep -vE
'[[:alpha:]]{2}_[[:alpha:]]{2}'`
for spin in $spins; do
@@ -409,7 +396,7 @@ for version in ${VERSIONS}; do
mock -v -r fedora-$version-$arch clean >
revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch init >>
revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch install $revisor_deps >>
revisor-${real_version}-$arch-respin.log 2>&1 && \
- echo -en "git clone
git://git.fedorahosted.org/revisor; \\
+ echo -en "git clone ${GIT_REVISOR}; \\
cd /revisor; autoreconf && ./configure; \\
./switchhere --yes; \\
find /var/lib/rpm/ -name '__db.*' -delete; \\