viewcvs/viewcvs-install.patch

   1 --- viewcvs-install.orig        Wed Oct  8 07:26:38 2003
   2 +++ viewcvs-install     Wed Oct  8 07:31:41 2003
   3 @@ -51,7 +51,8 @@
   4  """ % version
   5
   6  ## installer defaults
   7 -ROOT_DIR = "/usr/local/viewcvs-" + version
   8 +ROOT_DIR = "__ROOTDIR"
   9 +DESTROOT_DIR = "__DESTROOTDIR"
  10
  11
  12  ## list of files for installation
  13 @@ -65,11 +66,11 @@
  14      ("cgi/query.cgi", "cgi/query.cgi", 0755, 1, 0, 0),
  15      ("standalone.py", "standalone.py", 0755, 1, 0, 0),
  16
  17 -    ("cgi/viewcvs.conf.dist", "viewcvs.conf", 0644, 1,
  18 +    ("cgi/viewcvs.conf.dist", "viewcvs.conf.dist", 0644, 1,
  19              """Note: If you are upgrading from viewcvs-0.7 or earlier:
  20  The section [text] has been removed from viewcvs.conf.  The functionality
  21  went into the new files in subdirectory templates.""", 0),
  22 -    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
  23 +    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0),
  24
  25      ("lib/PyFontify.py", "lib/PyFontify.py", 0644, 0, 0, 1),
  26      ("lib/blame.py", "lib/blame.py", 0644, 0, 0, 1),
  27 @@ -158,7 +159,7 @@
  28
  29  def InstallFile(src_path, dest_path, mode, set_python_paths, prompt_replace,
  30                  compile_it):
  31 -  dest_path = os.path.join(ROOT_DIR, dest_path)
  32 +  dest_path = os.path.join(DESTROOT_DIR, dest_path)
  33
  34    if prompt_replace and os.path.exists(dest_path):
  35      # Collect ndiff output from ndiff
  36 @@ -192,7 +193,7 @@
  37      if type(prompt_replace) == type(""):
  38        print prompt_replace
  39      while 1:
  40 -      temp = raw_input("\n    File %s\n    exists and is different from source file.\n      DO YOU WANT TO,\n        overwrite [o]\n        do not overwrite [d]\n        view differences [v]: " % (dest_path))
  41 +      temp = "o"
  42        print
  43
  44        temp = string.lower(temp[0])
  45 @@ -245,10 +246,10 @@
  46      print INFO_TEXT
  47
  48      ## get the install path
  49 -    temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
  50 -    temp = string.strip(temp)
  51 -    if len(temp):
  52 -        ROOT_DIR = temp
  53 +    #temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
  54 +    #temp = string.strip(temp)
  55 +    #if len(temp):
  56 +    #    ROOT_DIR = temp
  57
  58      ## install the files
  59      print
  60