unity/scripts/respin.sh | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 9ecbfdc4a0a67f2e85730a25de39a42e9d0f8c9b
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Fri Mar 6 02:22:35 2009 +0100
Make the tmp dir obey the usual environment variable $TMPDIR
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index c60e2eb..b50fef7 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -10,7 +10,7 @@
# - you have sudo configured for the user you are executing the script with,
for
# at least the following commands:
#
-# 1) sudo make install (in /tmp/spin-kickstarts)
+# 1) sudo make install (in ${TMPDIR:-/tmp}/spin-kickstarts)
# 2) sudo ./revisor.py (if running from source)
# 3) sudo revisor (if running from installed RPMs)
# 4) sudo mkdir -p
@@ -145,23 +145,23 @@ done
##
if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then
- if [ -d /tmp/revisor ]; then
- cd /tmp/revisor
+ 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 /tmp/revisor
- cd /tmp/revisor
+ git clone git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor
+ cd ${TMPDIR:-/tmp}/revisor
fi
autoreconf -v && ./configure
./switchhere --yes
revisor_cmd="sudo ./revisor.py --cli"
- revisor_cwd="/tmp/revisor/"
+ revisor_cwd="${TMPDIR:-/tmp}/revisor/"
else
revisor_cmd="sudo revisor"
- revisor_cwd="/tmp/"
+ revisor_cwd="${TMPDIR:-/tmp}/"
fi
# If we're in the *.kanarip.com network, our webserver is called
www.kanarip.com
@@ -176,12 +176,12 @@ NOTIFICATION_SUCCESS="kana...@kanarip.com"
NOTIFICATION_FROMADD="kana...@kanarip.com"
# Cheat our way through spin-kickstarts
-if [ -d /tmp/spin-kickstarts ]; then
- cd /tmp/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
/tmp/spin-kickstarts
+ git clone git://git.fedorahosted.org/spin-kickstarts.git
${TMPDIR:-/tmp}/spin-kickstarts
fi
for version in ${VERSIONS}; do
@@ -204,7 +204,7 @@ for version in ${VERSIONS}; do
# Build the spin-kickstarts package for this version
ourwd=`pwd`
- cd /tmp/spin-kickstarts
+ cd ${TMPDIR:-/tmp}/spin-kickstarts
# Grab the appropriate branch from the list of branches already checked out
# locally and see if the branch we need is already there. If it's not, set
it up.
@@ -270,15 +270,15 @@ for version in ${VERSIONS}; do
# Now that it is done, run some more reporting on the spin
if [ ! -z "${isoimage}" ]; then
- sudo mkdir -p
/tmp/{loopmount_iso,loopmount_squashfs,loopmount_ext3fs}
- sudo mount -o loop,ro ${isoimage} /tmp/loopmount_iso && \
- sudo mount -o loop,ro
/tmp/loopmount_iso/LiveOS/squashfs.img /tmp/loopmount_squashfs && \
- sudo mount -o loop,ro
/tmp/loopmount_squashfs/LiveOS/ext3fs.img /tmp/loopmount_ext3fs && \
- sudo chroot /tmp/loopmount_ext3fs/ rpm -qa --qf
"%{SIZE}\t%{NAME}.%{ARCH}\n" | sort -n -r > rpms-$spin.log && \
+ sudo mkdir -p
${TMPDIR:-/tmp}/{loopmount_iso,loopmount_squashfs,loopmount_ext3fs}
+ sudo mount -o loop,ro ${isoimage}
${TMPDIR:-/tmp}/loopmount_iso && \
+ sudo mount -o loop,ro
${TMPDIR:-/tmp}/loopmount_iso/LiveOS/squashfs.img
${TMPDIR:-/tmp}/loopmount_squashfs && \
+ sudo mount -o loop,ro
${TMPDIR:-/tmp}/loopmount_squashfs/LiveOS/ext3fs.img
${TMPDIR:-/tmp}/loopmount_ext3fs && \
+ sudo chroot ${TMPDIR:-/tmp}/loopmount_ext3fs/ rpm -qa --qf
"%{SIZE}\t%{NAME}.%{ARCH}\n" | sort -n -r > rpms-$spin.log && \
sudo mv rpms-$spin.log /srv/revisor/$datestamp/$spin/log/
- sudo umount /tmp/loopmount_ext3fs && \
- sudo umount /tmp/loopmount_squashfs && \
- sudo umount /tmp/loopmount_iso
+ sudo umount ${TMPDIR:-/tmp}/loopmount_ext3fs && \
+ sudo umount ${TMPDIR:-/tmp}/loopmount_squashfs && \
+ sudo umount ${TMPDIR:-/tmp}/loopmount_iso
# Now that we have today's spin, if we have yesterday's
spin, we can compare
yesterday=`date --date=yesterday +"%Y%m%d"`
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
