8:56 p.m.
Author: justi9
Date: 2008-04-24 14:56:19 -0400 (Thu, 24 Apr 2008)
New Revision: 1977
Modified:
mgmt/cumin/Makefile
mgmt/cumin/bin/cumin-instance-init
mgmt/mint/Makefile
Log:
Change cumin-instance-init to create a home directory if it isn't
already present.
Use /var/lib/cumin as the cumin home dir.
Modified: mgmt/cumin/Makefile
===================================================================
--- mgmt/cumin/Makefile 2008-04-24 18:55:34 UTC (rev 1976)
+++ mgmt/cumin/Makefile 2008-04-24 18:56:19 UTC (rev 1977)
@@ -4,10 +4,10 @@
name := cumin
-home := ${SHARE_DIR}/${name}
lib := ${PYTHON_LIB_DIR}/${name}
doc := ${DOC_DIR}/${name}
log := ${VAR_DIR}/log/${name}
+share := ${SHARE_DIR}/${name}
build:
../bin/python-compile python
@@ -21,8 +21,8 @@
install -pm 0755 bin/* ${BIN_DIR}
install -d ${doc}
install -pm 0644 LICENSE COPYING ${doc}
- install -d ${home}/resources
- install -pm 0644 resources/* ${home}/resources
+ install -d ${share}/resources
+ install -pm 0644 resources/* ${share}/resources
install -d ${ETC_DIR}
install -pm 0644 etc/* ${ETC_DIR}
install -d ${log}
Modified: mgmt/cumin/bin/cumin-instance-init
===================================================================
--- mgmt/cumin/bin/cumin-instance-init 2008-04-24 18:55:34 UTC (rev 1976)
+++ mgmt/cumin/bin/cumin-instance-init 2008-04-24 18:56:19 UTC (rev 1977)
@@ -4,13 +4,15 @@
from os.path import *
def usage():
- print "Usage: cumin-instance-init [system|local]"
+ print "Usage: cumin-instance-init [system|local|prefix PREFIX]"
sys.exit(1)
def check_home(dir):
- if not isdir(dir):
- print "Error: home dir '%s' not found" % dir
- sys.exit(1)
+ if isdir(dir):
+ # Check writable
+ pass
+ else:
+ os.makedirs(dir)
if "-h" in sys.argv or "--help" in sys.argv:
usage()
@@ -21,30 +23,50 @@
usage()
if type == "system":
- home = join(sep, "usr", "share", "cumin")
+ prefix = join(sep, "usr")
+ home = join(sep, "var", "lib", "cumin")
check_home(home)
- map = ((join(sep, "usr", "bin"), join(home, "bin")),
- (join(sep, "etc"), join(home, "etc")),
- (join(sep, "var", "log", "cumin"), join(home,
"log")))
+ map = ((join(sep, "etc"), join(home, "etc")),
+ (join(sep, "var", "log", "cumin"), join(home,
"log")),
+ (join(prefix, "share", "cumin", "resources"),
join(home, "resources")),
+ (join(prefix, "share", "mint", "sql"),
join(home, "sql")))
elif type == "local":
- home = join(sep, "usr", "local", "share",
"cumin")
+ prefix = join(sep, "usr", "local")
+ home = join(sep, "var", "local", "lib",
"cumin")
check_home(home)
- map = ((join(sep, "usr", "local", "bin"), join(home,
"bin")),
- (join(sep, "usr", "local", "etc"), join(home,
"etc")),
- (join(sep, "var", "local", "log",
"cumin"), join(home, "log")))
+ map = ((join(prefix, "etc"), join(home, "etc")),
+ (join(sep, "var", "local", "log",
"cumin"), join(home, "log")),
+ (join(prefix, "share", "cumin", "resources"),
join(home, "resources")),
+ (join(prefix, "share", "mint", "sql"),
join(home, "sql")))
+elif type == "prefix":
+ try:
+ prefix = sys.argv[2]
+ except IndexError:
+ usage()
+
+ home = join(prefix, "var", "lib", "cumin")
+
+ check_home(home)
+
+ map = ((join(prefix, "etc"), join(home, "etc")),
+ (join(prefix, "var", "log", "cumin"), join(home,
"log")),
+ (join(prefix, "share", "cumin", "resources"),
join(home, "resources")),
+ (join(prefix, "share", "mint", "sql"),
join(home, "sql")))
else:
print "Error: '%s' is not a recognized instance type" % type
usage()
for src, dst in map:
if exists(dst):
- print "File already exists: %s" % dst
+ #print "File already exists: %s" % dst
+ pass
elif islink(dst):
- print "Link already exists: %s" % dst
+ #print "Link already exists: %s" % dst
+ pass
else:
- print "Creating symlink: %s -> %s" % (dst, src)
+ #print "Creating symlink: %s -> %s" % (dst, src)
os.symlink(src, dst)
Modified: mgmt/mint/Makefile
===================================================================
--- mgmt/mint/Makefile 2008-04-24 18:55:34 UTC (rev 1976)
+++ mgmt/mint/Makefile 2008-04-24 18:56:19 UTC (rev 1977)
@@ -6,10 +6,9 @@
name := mint
-home := ${SHARE_DIR}/${name}
lib := ${PYTHON_LIB_DIR}/${name}
doc := ${DOC_DIR}/${name}
-log := ${VAR_DIR}/log/${name}
+share := ${SHARE_DIR}/${name}
build:
../bin/python-compile python
@@ -21,8 +20,8 @@
install bin/* ${BIN_DIR}
install -d ${doc}
install LICENSE COPYING ${doc}
- install -d ${home}/sql
- install sql/* ${home}/sql
+ install -d ${share}/sql
+ install sql/* ${share}/sql
schema: schema-python schema-sql