[Cluster-devel] conga ./conga.spec.in.in luci/site/luci/bin/ru ...

[kupcevic@sourceware.org <kupcevic@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-18 20:01:14

Modified files:
	.              : conga.spec.in.in 
	luci/site/luci/bin: runzope.in 
	luci/utils     : luci_admin 

Log message:
	Conga: Hopefully last set of specfile complaints

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/bin/runzope.in.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.47&r2=1.48

--- conga/conga.spec.in.in	2006/08/18 13:59:00	1.32
+++ conga/conga.spec.in.in	2006/08/18 20:01:14	1.33
@@ -97,7 +97,7 @@
 Requires: zope
 Requires: plone >= 2.5
 %endif
-Requires: openssl mailcap stunnel 
+Requires: grep openssl mailcap stunnel 
 Requires: sed util-linux
 Requires: ricci = %{version}-%{release}
 
@@ -127,10 +127,10 @@
 				%{_localstatedir}/lib/luci
 
 %pre -n luci
-if [ "B`/bin/grep luci\:x /etc/group`" == "B" ]; then
+if ! /bin/grep luci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f luci >/dev/null 2>&1
 fi
-if [ "B`/bin/grep luci\:x /etc/passwd`" == "B" ]; then
+if ! /bin/grep luci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/luci -g luci luci >/dev/null 2>&1
 fi
 
@@ -146,7 +146,7 @@
    /usr/sbin/luci_admin restore >/dev/null 2>&1
 fi
 # set initial admin password (if not already set) to random value
-if [ "B`cat /var/lib/luci/.admin_password_has_been_set`" != "BTrue" ]; then
+if ! /bin/grep True /var/lib/luci/.admin_password_has_been_set; then
    /usr/sbin/luci_admin password --random >/dev/null 2>&1
 fi
 if [ "$LUCI_RUNNING" == "0" ]; then
@@ -244,10 +244,10 @@
 			%{_libexecdir}/ricci-modlog
 
 %pre -n ricci
-if [ "B`/bin/grep ricci\:x /etc/group`" == "B" ]; then
+if ! /bin/grep ricci\:x /etc/group 2>&1 >/dev/null; then
    /usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
 fi
-if [ "B`/bin/grep ricci\:x /etc/passwd`" == "B" ]; then
+if ! /bin/grep ricci\:x /etc/passwd 2>&1 >/dev/null; then
    /usr/sbin/useradd -r -M -s /sbin/nologin -d /var/lib/ricci -g ricci ricci >/dev/null 2>&1
 fi
 
--- conga/luci/site/luci/bin/runzope.in	2006/08/18 13:28:45	1.2
+++ conga/luci/site/luci/bin/runzope.in	2006/08/18 20:01:14	1.3
@@ -20,7 +20,7 @@
 ZOPE_RUN="$SOFTWARE_HOME/Zope2/Startup/run.py"
 
 
-if [ "B`cat $INSTANCE_HOME/.admin_password_has_been_set`" == "BTrue" ]; then
+if /bin/grep True /var/lib/luci/.admin_password_has_been_set; then
     exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
 else 
     echo ""
--- conga/luci/utils/luci_admin	2006/08/18 18:03:36	1.47
+++ conga/luci/utils/luci_admin	2006/08/18 20:01:14	1.48
@@ -97,7 +97,7 @@
 	return True
 
 def get_default_passwd_reset_flag():
-	return open(LUCI_ADMIN_SET_PATH, 'r').read(16) == 'True'
+	return open(LUCI_ADMIN_SET_PATH, 'r').read(16).strip() == 'True'
 
 
 def read_passwd(prompt, confirm_prompt):