r6117 - trunk/gnue-common

[jcater]

Author: jcater
Date: 2004-08-01 15:39:16 -0500 (Sun, 01 Aug 2004)
New Revision: 6117

Modified:
   trunk/gnue-common/setup-cvs.py
Log:
fix a previous 'fix'

Modified: trunk/gnue-common/setup-cvs.py
===================================================================
--- trunk/gnue-common/setup-cvs.py      2004-08-01 20:06:24 UTC (rev 6116)
+++ trunk/gnue-common/setup-cvs.py      2004-08-01 20:39:16 UTC (rev 6117)
@@ -421,14 +421,14 @@
 
 rootCommands.append("""
     cd %(GNUEDIR)s
-    ln -f -s %(CVSDIR)s/gnue/gnue-common/module/base/__init__.py .
-    ln -f -s %(CVSDIR)s/gnue/gnue-common/src common
-    if [ -f %(CVSDIR)s/gnue/gnue-common/src/.GDTD.py ]; then rm -f 
%(CVSDIR)s/gnue/gnue-common/src/.GDTD.py; fi
-#    ln -f -s %(CVSDIR)s/gnue/gnue-common/scripts/gnuedtd 
%(CVSDIR)s/common/src/.GDTD.py
+    ln -f -s %(CVSDIR)s/gnue-common/module/base/__init__.py .
+    ln -f -s %(CVSDIR)s/gnue-common/src common
+    if [ -f %(CVSDIR)s/gnue-common/src/.GDTD.py ]; then rm -f 
%(CVSDIR)s/gnue-common/src/.GDTD.py; fi
+#    ln -f -s %(CVSDIR)s/gnue-common/scripts/gnuedtd 
%(CVSDIR)s/common/src/.GDTD.py
 
 #    cd %(CONFDIR)s/etc
 #   rm -f sample.*
-#    ln -f -s %(CVSDIR)s/gnue/gnue-common/etc/sample.* .
+#    ln -f -s %(CVSDIR)s/gnue-common/etc/sample.* .
 
     rm -rf %(CONFDIR)s/share/locale/*
     cd %(CONFDIR)s/share/locale
@@ -522,9 +522,9 @@
     print "we can create a symlinked gnue.conf file that always mirrors CVS. 
This"
     print "will not allow you to customize gnue.conf, however."
     if getYesNo ("Do you want to use a symlinked gnue.conf file?",'N',):
-      command = "ln -s %(CVSDIR)s/gnue/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
+      command = "ln -s %(CVSDIR)s/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
     else:
-      command = "cp %(CVSDIR)s/gnue/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
+      command = "cp %(CVSDIR)s/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
 
     rootCommands.append(command)
 
@@ -533,7 +533,7 @@
   print ""
   print "You do not currently have a connections.conf configuration file."
   if getYesNo("Do you want to create a connections.conf based on the supplied 
examples? (Yes,No,All,neVer)",'Y','autoconf'):
-    rootCommands.append("cp 
%(CVSDIR)s/gnue/gnue-common/etc/sample.connections.conf 
%(CONFDIR)s/etc/connections.conf" % globals())
+    rootCommands.append("cp %(CVSDIR)s/gnue-common/etc/sample.connections.conf 
%(CONFDIR)s/etc/connections.conf" % globals())
 
   print
   print "NOTE: Your connections.conf file will need to"
@@ -548,9 +548,9 @@
     print "we can create a symlinked report-filters.conf file that always 
mirrors CVS. This"
     print "will not allow you to customize report-filters.conf, however."
     if getYesNo ("Do you want to use a symlinked report-filters.conf file? 
(Yes,No,All,neVer)",'N', 'symconf'):
-      command = "ln -s 
%(CVSDIR)s/gnue/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
+      command = "ln -s %(CVSDIR)s/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
     else:
-      command = "cp 
%(CVSDIR)s/gnue/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
+      command = "cp %(CVSDIR)s/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
 
     rootCommands.append(command)