Changeset 214 for trunk/dasscm/dasscm

Timestamp:

Jul 3, 2007, 2:10:55 PM (17 years ago)

Author:

joergs

Message:

improvements, bugfixes

Location:

trunk/dasscm

Files:

• . (modified) (1 prop)
• dasscm (modified) (13 diffs)

trunk/dasscm/dasscm

@@ -8 +8 @@
   qw($DASSCM_PROD $DASSCM_REPO $USER $DASSCM_USERNAME $DASSCM_USER $DASSCM_PASSWORD);
 use Cwd;
-use POSIX qw/getpgrp tcgetpgrp/;
-use Term::ReadKey;
+use Getopt::Long;
 use File::Basename;
 use File::Compare;
@@ -16 +15 @@
 use File::stat;
 use File::Path;
-use Getopt::Long;
+use Term::ReadKey;
 
 #
@@ -30 +29 @@
 
 my $config_file = "/etc/dasscm.conf";
-
-# my $config = SmartClient::Config->( $config_file );
-my $config = ConfigFile::read_config_file($config_file);
+my $config      = ConfigFile::read_config_file($config_file);
 my $DASSCM_LOCAL_REPOSITORY_BASE;
 my $DASSCM_REPOSITORY_NAME;
@@ -69 +66 @@
     print "   add <filename>\n";
     print "   commit <filename>\n";
+    print "   status <filename>\n";
     print "   diff <filename>\n";
     print "   help <subcommand>\n";
@@ -76 +74 @@
     print
       "svn checkout --no-auth-cache --username USERNAME https://dass-it.de/svn/dasscm/HOSTNAME\n";
-    print "environment variables\n", "    DASSCM_REPO\n", "    DASSCM_PROD¸n",
+    print "environment variables\n", "    DASSCM_REPO\n", "    DASSCM_PROD\n",
       "    DASSCM_USERNAME\n", "    DASSCM_PASSWORD\n", "are evaluated.\n";
     print "\n";
@@ -174 +172 @@
     my $basename = basename($filename_prod);
 
-    print "dir: " . $dirname_prod . "\n";
-    print "fn: " . $basename . "\n";
+    if ($verbose) {
+        print "dir: " . $dirname_prod . "\n";
+        print "fn: " . $basename . "\n";
+    }
 
     my $dirname_repo  = $DASSCM_REPO . "/" . $dirname_prod;
@@ -301 +301 @@
     } else {
         print "help for @_: ...\n";
+        usage();
     }
 }
@@ -309 +310 @@
     check_env();
 
-    my $output_username = "";
-    if ($DASSCM_USERNAME) {
-        $output_username = " ($DASSCM_USERNAME)";
-    }
-
-    print "Enter DASSCM user name", $output_username, ": ";
-    my $input_username = <STDIN>;
-    chomp($input_username);
+    my $input_username = $1;
+
+    if ( not $input_username ) {
+        my $output_username = "";
+        if ($DASSCM_USERNAME) {
+            $output_username = " ($DASSCM_USERNAME)";
+        }
+
+        print "Enter DASSCM user name", $output_username, ": ";
+        $input_username = <STDIN>;
+        chomp($input_username);
+    }
 
     # hidden password input
@@ -530 +535 @@
 
     # get command line options and store them in options hash
-    my $result = GetOptions( \%options, 'message=s' );
+    my $result = GetOptions( \%options, 'verbose', 'message=s' );
 
     # print options
@@ -537 +542 @@
     }
 
+    # set verbose to command line option
+    $verbose = $options{'verbose'};
+
+    #
+    # action accordinly to command are taken
+    # $command is rewritten in standard format,
+    # so we can test for it later on more simply
+    #
     $_ = $command;
     if (m/help/i) {
@@ -547 +560 @@
         init(@ARGV);
     } elsif (m/add/i) {
-        ## rewrite command
         $command = "add";
         add(@ARGV);
@@ -562 +574 @@
         $command = "status";
         status(@ARGV);
-    } elsif (m/activate/i) {
-        ## TODO
-        activate(@ARGV);
+
+        #     } elsif (m/activate/i) {
+        #         ## TODO
+        #         activate(@ARGV);
     } else {
         usage();
@@ -574 +587 @@
     # commitall
     # revert
-    # status (chkconf)
-}
+}