From 4b232564b38184cd6a9702963f638b2fc05d50d2 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 22 Oct 2007 06:04:33 +0000
Subject: [PATCH] 'upgpkg: fixed cvs building without local cvs'

---
 install/arch_bootmessage  | 2 +-
 install/arch_core_install | 8 ++++----
 install/arch_ftp_install  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/install/arch_bootmessage b/install/arch_bootmessage
index 63213055c..0843bd457 100644
--- a/install/arch_bootmessage
+++ b/install/arch_bootmessage
@@ -15,7 +15,7 @@ install ()
     	rm ${CVSMSG}
     	mkdir -p ${CVSMSG}
     	# checkout actual name from cvs rc.sysinit
-    	export CVSROOT=${CVSSETUP}
+    	export CVSROOT=${ARCH_CVSSETUP}
     	cd ${CVSMSG}
     	cvs -z3 co -r ${TAG} arch/build/base/initscripts/rc.sysinit
     	NAME=$(grep 'Arch' arch/build/base/initscripts/rc.sysinit | sed -e 's/printhl "//g' -e 's/$C_OTHER(${C_H2}//g' -e 's/\\n"//g' -e 's/$C_OTHER)//g')
diff --git a/install/arch_core_install b/install/arch_core_install
index 11504b987..5010fd897 100644
--- a/install/arch_core_install
+++ b/install/arch_core_install
@@ -89,9 +89,9 @@ install ()
     # always needed for every install
     cd ${ARCH_CVSTREE}
     if ! [ "${LOCALSETUP}" = "yes" ]; then
-	export CVSROOT={$ARCH_CVSSETUP}
+	export CVSROOT=${ARCH_CVSSETUP}
     	cvs -z3 co arch/scripts/{km,setup,quickinst}
-    	cvs -z3 co arch/doc/en/guide/install/ARCH_install-guide.txt
+    	cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
     	cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
     fi
     # fix km script
@@ -119,7 +119,7 @@ install ()
     fi
     DOCS=$(mktemp /tmp/docs.XXXX)
     if ! [ "${LOCALSETUP}" = "yes" ]; then 
-    	cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${DOCS}
+    	cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
     else
     	cp -f ${DOCUMENTATION} ${DOCS}
     fi
@@ -128,7 +128,7 @@ install ()
     add_dir "/src"
     if ! [ "${LOCALSETUP}" = "yes" ]; then
     	if ! [ "${TEMPDIR}" = "" ]; then
-    		cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${TEMPDIR}/arch/archdoc.txt
+    		cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
     		cd ${TEMPDIR}/arch/pkg/setup/
     		#wget ${FTPSERVER}/$(uname -m)/setup/pacman.pkg.tar.gz 
     		cd ${TEMPDIR}/core/pkg/
diff --git a/install/arch_ftp_install b/install/arch_ftp_install
index ee6b256bf..bc6b0d38d 100644
--- a/install/arch_ftp_install
+++ b/install/arch_ftp_install
@@ -30,9 +30,9 @@ install ()
     # always needed for every install
     cd ${ARCH_CVSTREE}
     if ! [ "${LOCALSETUP}" = "yes" ]; then 
-	export CVSROOT={ARCH_CVSSETUP}
+	export CVSROOT=${ARCH_CVSSETUP}
     	cvs -z3 co arch/scripts/{km,setup,quickinst}
-    	cvs -z3 co arch/doc/en/guide/install/ARCH_install-guide.txt
+    	cvs -z3 co arch/doc/en/guide/install/arch-install-guide.txt
     	cvs -z3 co arch/misc/bootdisk/2/mirrors.txt
     fi
     # fix km script
@@ -60,7 +60,7 @@ install ()
     fi
     DOCS=$(mktemp /tmp/docs.XXXX)
     if ! [ "${LOCALSETUP}" = "yes" ]; then 
-    	cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${DOCS}
+    	cp -f ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${DOCS}
     else
     	cp -f ${DOCUMENTATION} ${DOCS}
     fi
@@ -68,7 +68,7 @@ install ()
     add_file "${DOCS}.gz" "/arch/archdoc.txt.gz" 
     add_dir "/src"
     if ! [ "${LOCALSETUP}" = "yes" ]; then 
-    	! [ "${TEMPDIR}" = "" ] && cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/ARCH_install-guide.txt ${TEMPDIR}/arch/archdoc.txt
+    	! [ "${TEMPDIR}" = "" ] && cp ${ARCH_CVSTREE}/arch/doc/en/guide/install/arch-install-guide.txt ${TEMPDIR}/arch/archdoc.txt
     else
     	! [ "${TEMPDIR}" = "" ] && cp -f ${DOCUMENTATION} ${TEMPDIR}/arch/archdoc.txt
     fi