unity/scripts/respin.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
New commits: commit a2deb7c99904d6f802509770392ac0bc9eef9ce9 Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Sun Mar 8 01:08:11 2009 +0100
Fix excluding the localized spins
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh index e6dbb62..6fc4c02 100755 --- a/unity/scripts/respin.sh +++ b/unity/scripts/respin.sh @@ -174,12 +174,16 @@ done ##
if [ -z "`rpm -qv revisor-cli | grep -v 'not installed'`" ]; then - if [ -d ${TMPDIR:-/tmp}/revisor ]; then - cd ${TMPDIR:-/tmp}/revisor - git checkout master - git pull git://git.fedorahosted.org/revisor master + 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 - git clone git://git.fedorahosted.org/revisor ${TMPDIR:-/tmp}/revisor cd ${TMPDIR:-/tmp}/revisor fi
@@ -252,7 +256,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 -vE ".*??_??.*"` + spins=`${revisor_cmd} --config /etc/revisor-unity/${real_version}-live-respin.conf --list-models | grep "^ ${real_version}-${arch}-" | awk '{print $1}' | grep -v _`
for spin in $spins; do