Changeset 190

Timestamp:

Nov 11, 2004, 10:55:09 AM (20 years ago)

Author:

joergs

Message:

add check for username.
bugfix: commit

File:

• trunk/dasscm/dasscm (modified) (8 diffs)

trunk/dasscm/dasscm

@@ -5 +5 @@
 use strict;
 
-use Env qw($DASSCM_PROD $DASSCM_REPO);
+use Env qw($DASSCM_PROD $DASSCM_REPO $USER $DASSCM_USER $DASSCM_PW);
 use Cwd;
 use File::Basename;
@@ -18 +18 @@
 #
 my $SVN = "svn ";
+my $subversion_options = "";
 
 #####################################################################
@@ -25 +26 @@
 sub usage()
 {
-        print "dasscm is intended to help versioning configuration files\n\n";
-        
-        print "usage: dasscm <subcommand> [options] [args]\n\n";
+        print "usage: dasscm <subcommand> [options] [args]\n";
+        print "\n";
+        print "dasscm is intended to help versioning configuration files\n";
+        print "\n";     
         print "Available subcommands:\n";
         print "   add <filename>\n";
@@ -33 +35 @@
         print "   diff <filename>\n";
         print "   help <subcommand>\n";
+        print "\n";     
+        print "preperation:\n";
+        print "check out the configuration repository, e.g.\n";
+        print "svn checkout --no-auth-cache --username $USER https://dass-it.de/svn/lvermgeo/technical/config/\n";
+        print "environment variables DASSCM_REPO, DASSCM_PROD and DASSCM_USER are evaluated.\n";
+        print "\n";
 }
 
@@ -48 +56 @@
         # DASSCM_REPO
         if ( ! $DASSCM_REPO ) {
-                die "Envirnonment variable DASSCM_REPO not set.\nSet DASSCM_REPO to the directory of the versioning system checkout for this machine.";
+                die "Envirnonment variable DASSCM_REPO not set.\nSet DASSCM_REPO to the directory of the versioning system checkout for this machine.\n";
         }
         print "DASSCM_REPO: ".$DASSCM_REPO."\n";
@@ -55 +63 @@
         }
         
+        # User settings
+        # user root is not allowed for checkins.
+        # if user is root, DASSCM_USER has to be set, 
+        # otherwise USER can be used
+        if ( "$USER" eq "root" ) {
+                if ( ! $DASSCM_USER ) {
+                        die "Envirnonment variable DASSCM_USER not set.\nSet DASSCM_USER to your subversion user account.\n";
+                } 
+                $subversion_options .= " --no-auth-cache "
+        } elsif ( ! $DASSCM_USER ) {
+                $DASSCM_USER=$USER;
+        }       
 }
 
@@ -147 +167 @@
 
         # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit $DASSCM_REPO" );
+        system( "$SVN commit --username $DASSCM_USER $subversion_options $DASSCM_REPO" );
         # TODO: commit (-m)
 
@@ -166 +186 @@
                 die;
         }
+        
+        copy( $filename_prod, $filename_repo ) or die $!;
 
         # commit calls $EDITOR. uses "system" here, to display output
-        system( "$SVN commit $DASSCM_REPO" );
+        system( "$SVN commit --username $DASSCM_USER $subversion_options $DASSCM_REPO" );
         # TODO: commit (-m)
 }