X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famaddclient.pl;h=8c62d0ecd27b8fe34a1951fe83c1d08779a458dc;hb=377e15b597bafb8e7c2a100f11a0166f7220fe1c;hp=510b0e6246f2d2e138141bbfa0f91b64b4c884ac;hpb=6ba576375c19b829b2a13dbe6562eedd2716b9ea;p=debian%2Famanda

diff --git a/server-src/amaddclient.pl b/server-src/amaddclient.pl
index 510b0e6..8c62d0e 100755
--- a/server-src/amaddclient.pl
+++ b/server-src/amaddclient.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 #
-# Copyright (c) 2006 Zmanda Inc.  All Rights Reserved.
+# Copyright (c) 2007,2008 Zmanda, Inc.  All Rights Reserved.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -15,8 +15,8 @@
 # with this program; if not, write to the Free Software Foundation, Inc.,
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# Contact information: Zmanda Inc, 505 N Mathlida Ave, Suite 120
-# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
+# Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
+# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 #
 
 
@@ -39,16 +39,8 @@ my $def_dumptype="user-tar";
 
 my $sp_diskfile=0;
 
-# Get the version suffix.
-my $USE_VERSION_SUFFIXES = '@USE_VERSION_SUFFIXES@';
-my $suf = '';
-if ( $USE_VERSION_SUFFIXES =~ /^yes$/i ) {
-        $suf='-@VERSION@';
-}
-
-
 sub usage {
-        print "$0 $suf\n";      
+        print "$0\n";      
         print "\t\t--config <config>         Required. Ex: DailySet1\n";       
 	print "\t\t--client <FQDN-name>      Required. Ex: server.zmanda.com\n";
         print "\t\t--diskdev <directory>     Required. Ex: /home\n";
@@ -349,7 +341,7 @@ unless ( defined $dumptype ) {
     my $scp_opt2="-o ConnectTimeout=15";   #timeout after 15 seconds
     my $ssh="ssh";
     my $ssh_opt="-x"; # -x as a placeholder, otherwise ssh complains
-    my $mkdir="mkdir";
+    my $mkdir="mkdir -p";
     my $client_conf_dir="$confdir/$config";
     my $amanda_client_conf="$client_conf_dir/amanda-client.conf";
     my $file="$amandahomedir/.amandahosts";
@@ -476,7 +468,7 @@ if ( $exit_value !=0 ) {
 }
 
 #create gnutar_list_dir
-if ( defined $tarlist && !defined $no_update_client ) {
+if ( defined $tarlist && !defined $no_client_update ) {
  system "$ssh", "$ssh_opt", "$amanda_user\@$client", "$mkdir", "$gnutar_list_dir";
  $exit_value  = $? >> 8;
 if ( $exit_value !=0 ) {