X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famaddclient.pl;h=d685208e852265278b4957351d540d2a3a11157e;hb=HEAD;hp=3e52466ed779d1a8d4d6d937faba9634fda624fb;hpb=79cdc4b6ea8848b21ba4a0e7d2fd3bc401e0bebe;p=debian%2Famanda

diff --git a/server-src/amaddclient.pl b/server-src/amaddclient.pl
index 3e52466..d685208 100755
--- a/server-src/amaddclient.pl
+++ b/server-src/amaddclient.pl
@@ -1,10 +1,11 @@
 #!@PERL@
 #
-# Copyright (c) 2005-2008 Zmanda Inc.  All Rights Reserved.
+# Copyright (c) 2007-2012 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
-# by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -15,7 +16,7 @@
 # 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, 465 S Mathlida Ave, Suite 300
+# Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 #
 
@@ -39,16 +40,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 +342,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";