switchhere | 8 ++++----
unity/scripts/respin.sh | 10 +---------
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 0c142081868d042abc07a4ad782cb284793c245e
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Fri Feb 27 17:44:08 2009 +0100
Fix indentation in switchhere
Fix |tee -a (use >> instead) so we get the correct $?
diff --git a/switchhere b/switchhere
index 26455a9..436d9b4 100755
--- a/switchhere
+++ b/switchhere
@@ -8,11 +8,11 @@ else
fi
if [ -z "$answer" -o "${answer[0]}" == "N" -o "${answer[0]}" == "n" ]; then
- echo "Quitting."
- exit 0
+ echo "Quitting."
+ exit 0
elif [ "$answer" != "Y" -a "$answer" != "y" ]; then
- echo "That was no sane input. Quitting."
- exit 0
+ echo "That was no sane input. Quitting."
+ exit 0
fi
[ -d /etc/revisor ] && sudo rm -rf /etc/revisor
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index f2a06db..3714e9f 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -238,14 +238,6 @@ for version in $VERSIONS; do
echo "Creating $spin"
- mock -r fedora-$version-$arch clean | tee
revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch init | tee -a
revisor-f$version-$arch-respin.log && \
- mock -r fedora-$version-$arch install $revisor_deps | tee -a
revisor-f$version-$arch-respin.log && \
- echo -en "git clone git://git.fedorahosted.org/revisor\n" | mock
-r fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; ./switchhere --yes\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "cd /revisor; autoreconf && ./configure\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
- echo -en "find /var/lib/rpm/ -name '__db.*' -delete\n" | mock -r
fedora-$version-$arch shell | tee -a revisor-f$version-$arch-respin.log && \
-
sleep 10
datestamp=`date +'%Y%m%d'`
@@ -265,7 +257,7 @@ for version in $VERSIONS; do
./revisor.py --cli --config
unity/conf/f$version-install-respin.conf \\
--destination-directory /srv/revisor/$datestamp/ \\
--model f$version-$arch-respin --debug 9 \\
- --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch
shell | tee -a revisor-f$version-$arch-respin.log
+ --clean-up $cleanup\n" | mock -v -r fedora-$version-$arch
shell >> revisor-f$version-$arch-respin.log
[ $? -gt 0 ] && \
printf "Spin f$version-$arch-respin failed, log file
attached.$MESSAGE_END" "$datestamp" "f$version-$arch-respin" \
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
