Ovirt devel - Jun 2008 - [PATCH 3/4] change $FEDORA to shorter $FN

More reviewability changes.
>From 17ed55af8a99cf70ca6fd6e03e741035f38fb7ef Mon Sep 17 00:00:00 2001
Date: Sun, 15 Jun 2008 14:51:44 +0200
Subject: [PATCH] change $FEDORA to shorter $FN

---
 build-all.sh |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/build-all.sh b/build-all.sh
index e680fcd..eb9c848 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -18,7 +18,7 @@ die() { warn "$@"; try_h; exit 1; }

 cd $(dirname $0)
 BASE=$(pwd)
-FEDORA=9
+FN=9
 ARCH=$(uname -i)
 HTDOCS=/var/www/html
 OVIRT=$HTDOCS/ovirt
@@ -148,10 +148,10 @@ if [ $update_pungi != 0 ]; then
     fedora_mirror=http://mirrors.fedoraproject.org/mirrorlist
     # use Fedora + updates
     cat > $PUNGIKS << EOF
-repo --name=f$FEDORA \
-  --mirrorlist=$fedora_mirror?repo=fedora-$FEDORA&arch=\$basearch
-repo --name=f$FEDORA-updates \
- 
--mirrorlist=$fedora_mirror?repo=updates-released-f$FEDORA&arch=\$basearch
+repo --name=f$FN \
+  --mirrorlist=$fedora_mirror?repo=fedora-$FN&arch=\$basearch
+repo --name=f$FN-updates \
+  --mirrorlist=$fedora_mirror?repo=updates-released-f$FN&arch=\$basearch
 EOF
     # + ovirt.org repo for updates not yet in Fedora
     # + local ovirt repo with locally rebuilt ovirt* RPMs ( options -w and -n )
@@ -165,16 +165,16 @@ EOF
     fi
     cat >> $PUNGIKS << EOF
 repo --name=ovirt-org \
-  --baseurl=http://ovirt.org/repos/ovirt/$FEDORA/\$basearch $excludepkgs
+  --baseurl=http://ovirt.org/repos/ovirt/$FN/\$basearch $excludepkgs
 EOF
     if [ $include_src != 0 ]; then
         cat >> $PUNGIKS << EOF
-repo --name=f$FEDORA-src \
-  --mirrorlist=$fedora_mirror?repo=fedora-source-$FEDORA&arch=\$basearch
-repo --name=f$FEDORA-updates-src \
- 
--mirrorlist=$fedora_mirror?repo=updates-released-source-f$FEDORA&arch=\$basearch
+repo --name=f$FN-src \
+  --mirrorlist=$fedora_mirror?repo=fedora-source-$FN&arch=\$basearch
+repo --name=f$FN-updates-src \
+ 
--mirrorlist=$fedora_mirror?repo=updates-released-source-f$FN&arch=\$basearch
 repo --name=ovirt-org-src \
-  --baseurl=http://ovirt.org/repos/ovirt/$FEDORA/src $excludepkgs
+  --baseurl=http://ovirt.org/repos/ovirt/$FN/src $excludepkgs
 EOF
     else
         pungi_flags+=" --nosource"
@@ -198,9 +198,9 @@ anaconda-runtime
 %end
 EOF
     cd $PUNGI
-    pungi --ver=$FEDORA $pungi_flags -c $PUNGIKS --force
+    pungi --ver=$FN $pungi_flags -c $PUNGIKS --force
     if [ $include_src != 0 ]; then
-        pungi --ver=$FEDORA -I  --sourceisos --nosplitmedia -c $PUNGIKS --force
+        pungi --ver=$FN -I  --sourceisos --nosplitmedia -c $PUNGIKS --force
     fi
     restorecon -r .
 fi
@@ -211,7 +211,7 @@ if [ $update_node = 1 ]; then
     cd $BASE/ovirt-host-creator
     rm -rf rpm-build
     cat > repos.ks << EOF
-repo --name=f$FEDORA --baseurl=http://localhost/pungi/$FEDORA/$ARCH/os
+repo --name=f$FN --baseurl=http://localhost/pungi/$FN/$ARCH/os

 EOF
     bumpver
@@ -232,7 +232,7 @@ if [ $update_app == 1 ]; then
     cd $BASE/wui-appliance
     make clean
     cat > repos-x86_64.ks << EOF
-url --url http://$VIRBR/pungi/$FEDORA/$ARCH/os
+url --url http://$VIRBR/pungi/$FN/$ARCH/os
 EOF
     excludepkgs     if [[ -f $OVIRT/repodata/repomd.xml ]]; then
@@ -242,13 +242,13 @@ repo --name=ovirt --baseurl=http://$VIRBR/ovirt
 EOF
     fi
     cat >> repos-x86_64.ks << EOF
-repo --name=ovirt-org --baseurl=http://ovirt.org/repos/ovirt/$FEDORA/x86_64
$excludepkgs
+repo --name=ovirt-org --baseurl=http://ovirt.org/repos/ovirt/$FN/x86_64
$excludepkgs

 EOF
     make
     cp wui-rel-*.ks $OVIRT
     ./create-wui-appliance.sh \
-      -t http://$VIRBR/pungi/$FEDORA/$ARCH/os \
+      -t http://$VIRBR/pungi/$FN/$ARCH/os \
       -k http://$VIRBR/ovirt/wui-rel-$ARCH.ks $app_type

     set +x
--
1.5.6.rc2.47.g075fa

Jim Meyering wrote:
> More reviewability changes.
> 
>>From 17ed55af8a99cf70ca6fd6e03e741035f38fb7ef Mon Sep 17 00:00:00 2001
> Date: Sun, 15 Jun 2008 14:51:44 +0200
> Subject: [PATCH] change $FEDORA to shorter $FN
Hm.  I think I actually prefer FEDORA; it's a little clearer than FN on what
it
is (especially for people, like me, who have never looked at build-all.sh before
:).  In fact, I might even go so far as to say FEDORANUM or something like that,
although I think FEDORA is good enough.  What was your intention with the patch?

Chris Lalancette