Changeset 932

Timestamp:

Dec 3, 2010, 4:24:59 PM (14 years ago)

Author:

joergs

Message:

added /etc/profile.d/dasscm.sh

Location:

dasscm/trunk

Files:

• dasscm.spec (modified) (1 diff)
• etc/dasscm.conf (modified) (1 diff)
• etc/profile.d/dasscm.sh (modified) (1 diff)

dasscm/trunk/dasscm.spec

@@ -53 +53 @@
 install -m 755 usr/bin/dasscm $RPM_BUILD_ROOT/usr/bin/
 install -m 755 usr/bin/dasscm_remote_update.sh $RPM_BUILD_ROOT/usr/bin/
+mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/
+mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/plugin-results/
+
 mkdir -p $RPM_BUILD_ROOT/etc/
 install -m 640 etc/dasscm.conf $RPM_BUILD_ROOT/etc/
-mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/
-mkdir -p $RPM_BUILD_ROOT/var/lib/dasscm/plugin-results/
+mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
+install -m 644 etc/profile.d/dasscm.sh $RPM_BUILD_ROOT/etc/profile.d/
+
 %if %(test -d /etc/bash_completion.d/ && echo 1 || echo 0)
     %define use_bash_completion 1

dasscm/trunk/etc/dasscm.conf

@@ -32 +32 @@
 #DASSCM_CHECKOUT_USERNAME=dasscm
 #DASSCM_CHECKOUT_PASSWORD=
+
+#
+# evaluated by /etc/profile.d/dasscm.sh
+# If set to "yes", 
+# a "dasscm status" is executed during shell login
+#
+DASSCM_STATUS_AT_SHELL_LOGIN="yes"
 
 #

dasscm/trunk/etc/profile.d/dasscm.sh

@@ -1 +1 @@
 #!/bin/sh
 
-if [ `whoami` = "root" ]; then
-  if ! dasscm check > /dev/null; then
-    printf "* DASSCM warnings *\n"
-    dasscm status
-    printf "* please check-in these changes first *\n"
-  fi
+CONFIG="/etc/dasscm.conf"
+
+if [ -r $CONFIG ]; then
+    source $CONFIG
+
+    # check if a warn message is wanted 
+    # and dasscm is already configured ($DASSCM_REPOSITORY_NAME)
+    if [ "$DASSCM_STATUS_AT_SHELL_LOGIN" = "yes" -a -n "$DASSCM_REPOSITORY_NAME" ]; then
+
+        # check if write permissions are given
+        if [ -w "${DASSCM_LOCAL_REPOSITORY_BASE}/${DASSCM_REPOSITORY_NAME}" ]; then
+
+            # get dasscm status
+            # and print it, if a result is given
+            RESULT=`dasscm status`
+            if [ $? -ne 0 ]; then
+                printf "* DASSCM warnings *\n"
+                printf "$RESULT\n"
+                printf "* please use dasscm to check-in these changes *\n"
+            fi
+        fi
+    fi
 fi
-
-# TODO: check configured
-# alternative for non-root: X=`echo | sudo -S dasscm check`