]> arthur.barton.de Git - netatalk.git/commitdiff
Remove apple_* shell scripts, use ad counterparts instead
authorFrank Lahm <franklahm@googlemail.com>
Mon, 11 Oct 2010 20:23:17 +0000 (22:23 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 11 Oct 2010 20:23:17 +0000 (22:23 +0200)
configure.in
contrib/shell_utils/Makefile.am
contrib/shell_utils/apple_cp.in [deleted file]
contrib/shell_utils/apple_mv.in [deleted file]
contrib/shell_utils/apple_rm.in [deleted file]
man/man1/Makefile.am
man/man1/apple_cp.1.tmpl [deleted file]
man/man1/apple_mv.1.tmpl [deleted file]
man/man1/apple_rm.1.tmpl [deleted file]

index 75162bd6c133f79746b3d4be857420282e8ed626..534596176305db33a115eb951342bdb82fa90831 100644 (file)
@@ -1297,10 +1297,7 @@ AC_OUTPUT([Makefile
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
        contrib/shell_utils/afpd-mtab.pl
-       contrib/shell_utils/apple_cp
     contrib/shell_utils/apple_dump
-       contrib/shell_utils/apple_mv
-       contrib/shell_utils/apple_rm
        contrib/shell_utils/asip-status.pl
        contrib/timelord/Makefile
        contrib/a2boot/Makefile
@@ -1336,7 +1333,6 @@ AC_OUTPUT([Makefile
        libatalk/nbp/Makefile
        libatalk/netddp/Makefile
        libatalk/util/Makefile
-       libatalk/util/test/Makefile
        libatalk/tdb/Makefile
        libatalk/unicode/Makefile
        libatalk/unicode/charsets/Makefile
index bb2f1496f10b47705e87f11d169f5343ca0ca203..c8cefe1e8ef8c8d0520b3c673e79474f43db1601 100644 (file)
@@ -6,7 +6,6 @@ GENERATED_FILES = lp2pap.sh
 TEMPLATE_FILES = lp2pap.sh.tmpl
 PERLSCRIPTS = \
        afpd-mtab.pl \
-       apple_cp apple_mv apple_rm  \
        asip-status.pl \
        apple_dump
 
diff --git a/contrib/shell_utils/apple_cp.in b/contrib/shell_utils/apple_cp.in
deleted file mode 100755 (executable)
index b8a75ab..0000000
+++ /dev/null
@@ -1,67 +0,0 @@
-#!@PERL@
-# 
-# $Id: apple_cp.in,v 1.1 2002-01-17 05:59:25 srittau Exp $
-
-$USAGE = <<USAGE;
-Usage: $0 filename1 filename2
-       $0 filename ...  directory
-Do an apple copy, copying the resource fork as well
-USAGE
-
-die $USAGE if @ARGV < 2;
-
-@from = @ARGV; pop(@from);
-$to = $ARGV[-1];
-
-if (-f $to && @from > 1) { die $USAGE; }
-
-foreach $from (@from) {
-    if (!-f $from) {   
-       print STDERR "file $from does not exist\n";
-       die $USAGE;
-    }
-    
-    if (!-d $to && @from >1) {
-       print STDERR "directory $to does not exist\nCan't copy multiple files into one file.\n";
-       die $USAGE;
-    }
-    
-    $cmd = "cp '$from' '$to'";
-    system $cmd || die "error executing $cmd";
-    
-    ($from_dir, $from_file) = split_dir_file($from);
-
-    if (-d $to) {
-       if (!-d "$to/.AppleDouble") {
-           mkdir("$to/.AppleDouble", 0777);
-       }       
-       $cmd = "cp '$from_dir/.AppleDouble/$from_file' '$to/.AppleDouble/$from_file'";
-    } else {
-       ($to_dir, $to_file) = split_dir_file($to);
-       if (!-d "$to_dir/.AppleDouble") {
-           mkdir("$to_dir/.AppleDouble", 0777);
-       }       
-       $cmd = "cp '$from_dir/.AppleDouble/$from_file' '$to_dir/.AppleDouble/$to_file'";
-    }
-
-    system $cmd || die "error executing $cmd";
-}
-
-# split a file path into a directory and file name.
-sub split_dir_file {
-    my $path = shift;
-
-    @path_elems = split(/\//, $path);
-
-    my $file = pop(@path_elems);
-    my $dir;
-    if (!@path_elems) {
-       $dir = '.';
-    } else {
-       $dir = join('/', @path_elems);
-    }
-
-    $dir, $file;
-}
-
-
diff --git a/contrib/shell_utils/apple_mv.in b/contrib/shell_utils/apple_mv.in
deleted file mode 100755 (executable)
index 79cf579..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-#!@PERL@
-# 
-# $Id: apple_mv.in,v 1.1 2002-01-17 05:59:25 srittau Exp $
-
-$USAGE = <<USAGE;
-Usage: $0 filename1 filename2
-       $0 filename ...  directory
-Do an apple move, moving the resource fork as well
-USAGE
-
-@from = @ARGV; pop(@from);
-$to = $ARGV[-1];
-
-if (-f $to && @from > 1) { die $USAGE; }
-
-foreach $from (@from) {
-    if (!-f $from) {   
-       print STDERR "file $from does not exist\n";
-       die $USAGE;
-    }
-
-    if (!-d $to && @from >1) {
-       print STDERR "directory $to does not exist\nCan't move multiple files into one file.\n";
-       die $USAGE;
-    }
-    
-    $from = escape_bad_chars($from);
-    $to = escape_bad_chars($to);
-    $cmd = "mv $from $to";
-    system $cmd || die "error executing $cmd";
-    
-    ($from_dir, $from_file) = split_dir_file($from);
-
-    if (-d $to) {
-       if (!-d "$to/.AppleDouble") {
-           mkdir("$to/.AppleDouble", 0777);
-       }
-       $cmd = "mv $from_dir/.AppleDouble/$from_file $to/.AppleDouble/$from_file";
-    } else {
-       ($to_dir, $to_file) = split_dir_file($to);
-
-       if (!-d $to_dir) {
-           print STDERR "directory $to does not exist\n";
-           die $USAGE;
-       }
-    
-       if (!-d "$to_dir/.AppleDouble") {
-           mkdir("$to_dir/.AppleDouble", 0777);
-       }
-       $cmd = "mv $from_dir/.AppleDouble/$from_file $to_dir/.AppleDouble/$to_file";
-    }
-
-    system $cmd || die "error executing $cmd";
-}
-
-sub escape_bad_chars {
-    my($file) = @_;
-    $file=~s/([^a-zA-Z0-9.-_])/\\$1/;
-    return $file;
-}
-
-# split a file path into a directory and file name.
-sub split_dir_file {
-    my $path = shift;
-
-    @path_elems = split(/\//, $path);
-
-    my $file = pop(@path_elems);
-    my $dir;
-    if (!@path_elems) {
-       $dir = '.';
-    } else {
-       $dir = join('/', @path_elems);
-    }
-
-    $dir, $file;
-}
-
-
diff --git a/contrib/shell_utils/apple_rm.in b/contrib/shell_utils/apple_rm.in
deleted file mode 100755 (executable)
index 6595937..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!@PERL@
-# 
-# $Id: apple_rm.in,v 1.1 2002-01-17 05:59:25 srittau Exp $
-
-$USAGE = <<USAGE;
-Usage: $0 filename ...
-Do an apple remove, remove the resource fork as well
-USAGE
-
-die $USAGE if @ARGV < 1;
-
-foreach $path (@ARGV) {
-    if (!-f $path) {
-       print STDERR "file $path does not exist\n";
-       die $USAGE;
-    }
-
-    ($dir, $file) = &split_dir_file($path);
-
-    $cmd = "rm '$path'";
-    system $cmd || die "error executing $cmd";
-    
-    $cmd = "rm '$dir/.AppleDouble/$file'";
-    system $cmd || die "error executing $cmd";
-}
-
-# split a file path into a directory and file name.
-sub split_dir_file {
-    my $path = shift;
-
-    @path_elems = split(/\//, $path);
-
-    my $file = pop(@path_elems);
-    my $dir;
-    if (!@path_elems) {
-       $dir = '.';
-    } else {
-       $dir = join('/', @path_elems);
-    }
-
-    $dir, $file;
-}
index 9ccb204f0f4ff4392860edee546e5249f0893649..42ee9692b1d6fed22939f6e4808bfebd866af553 100644 (file)
@@ -12,8 +12,8 @@ SUFFIXES= .tmpl .
            -e s@:DEFAULT_CNID_SCHEME:@${DEFAULT_CNID_SCHEME}@ \
            <$< >$@
 
-GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1 uniconv.1 asip-status.pl.1
-TEMPLATE_FILES = apple_cp.1.tmpl apple_mv.1.tmpl apple_rm.1.tmpl uniconv.1.tmpl asip-status.pl.1.tmpl
+GENERATED_MANS = uniconv.1 asip-status.pl.1
+TEMPLATE_FILES = uniconv.1.tmpl asip-status.pl.1.tmpl
 NONGENERATED_MANS      =       achfile.1  \
                                ad.1 \
                                afile.1 \
diff --git a/man/man1/apple_cp.1.tmpl b/man/man1/apple_cp.1.tmpl
deleted file mode 100644 (file)
index 59dd84b..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-'\" t
-.\"     Title: apple_cp
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Aug 2004
-.\"    Manual: Netatalk 2.1
-.\"    Source: Netatalk 2.1
-.\"  Language: English
-.\"
-.TH "APPLE_CP" "1" "22 Aug 2004" "Netatalk 2.1" "Netatalk 2.1"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-apple_cp \- Do an apple copy, copying file metadata and the resource fork as well
-.SH "SYNOPSIS"
-.PP
-\fB:BINDIR:/apple_cp\fR\fB\fR
-\fISOURCE DEST\fR
-\fB:BINDIR:/apple_cp\fR
-\fISOURCE\fR\&.\&.\&.
-\fIDIRECTORY\fR
-.SH "DESCRIPTION"
-.PP
-\fBapple_cp\fR
-is a perl script to copy SOURCE to DEST or multiple SOURCE(s) to DIRECTORY\&. It also copies the file specific metadata (including resource forks) to the \&.AppleDouble directory for DEST or DIRECTORY\&. If the \&.AppleDouble directory doesn\'t exist for DEST or DIRECTORY it will create it\&.
-.SH "EXAMPLES"
-.PP
-\fB:BINDIR:/apple_cp\fR
-test\&.text /target/directory/
-.PP
-\fB:BINDIR:/apple_cp\fR
-test\&.text /target/directory/test2\&.text
-.PP
-\fB:BINDIR:/apple_cp\fR
-test\&.text testing\&.text /target/directory/
-.SH "REPORTING BUGS"
-.PP
-Report bugs to the Netatalk\-devel list <netatalk\-devel@lists\&.sourceforge\&.net>\&.
-.SH "SEE ALSO"
-.PP
-\fBapple_mv\fR(1),
-\fBapple_rm\fR(1)\&.
diff --git a/man/man1/apple_mv.1.tmpl b/man/man1/apple_mv.1.tmpl
deleted file mode 100644 (file)
index e91d28c..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-'\" t
-.\"     Title: apple_mv
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Aug 2004
-.\"    Manual: Netatalk 2.1
-.\"    Source: Netatalk 2.1
-.\"  Language: English
-.\"
-.TH "APPLE_MV" "1" "22 Aug 2004" "Netatalk 2.1" "Netatalk 2.1"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-apple_mv \- Do an apple move, moving metadata and the resource fork as well
-.SH "SYNOPSIS"
-.PP
-\fB:BINDIR:/apple_mv\fR\fB\fR
-\fISOURCE DEST\fR
-\fB:BINDIR:/apple_mv\fR
-\fISOURCE\fR\&.\&.\&.
-\fIDIRECTORY\fR
-.SH "DESCRIPTION"
-.PP
-\fBapple_mv\fR
-is a perl script to move SOURCE to DEST or multiple SOURCE(s) to DIRECTORY\&. It also moves the file specific metadata (including resource forks) to the \&.AppleDouble directory for DEST or DIRECTORY\&. If the \&.AppleDouble directory doesn\'t exist for DEST or DIRECTORY it will create it\&.
-.SH "EXAMPLES"
-.PP
-\fB:BINDIR:/apple_mv\fR
-test\&.text /target/directory/
-.PP
-\fB:BINDIR:/apple_mv\fR
-test\&.text /target/directory/test2\&.text
-.PP
-\fB:BINDIR:/apple_mv\fR
-test\&.text testing\&.text /target/directory/
-.SH "REPORTING BUGS"
-.PP
-Report bugs to the Netatalk\-devel list <netatalk\-devel@lists\&.sourceforge\&.net>\&.
-.SH "SEE ALSO"
-.PP
-\fBapple_cp\fR(1),
-\fBapple_rm\fR(1)\&.
diff --git a/man/man1/apple_rm.1.tmpl b/man/man1/apple_rm.1.tmpl
deleted file mode 100644 (file)
index 90dc0a9..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-'\" t
-.\"     Title: apple_rm
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 22 Aug 2004
-.\"    Manual: Netatalk 2.1
-.\"    Source: Netatalk 2.1
-.\"  Language: English
-.\"
-.TH "APPLE_RM" "1" "22 Aug 2004" "Netatalk 2.1" "Netatalk 2.1"
-.\" -----------------------------------------------------------------
-.\" * set default formatting
-.\" -----------------------------------------------------------------
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.\" -----------------------------------------------------------------
-.\" * MAIN CONTENT STARTS HERE *
-.\" -----------------------------------------------------------------
-.SH "NAME"
-apple_rm \- Do an apple remove, remove metadata and resource fork as well
-.SH "SYNOPSIS"
-.PP
-\fB:BINDIR:/apple_rm\fR\fB\fR
-\fIFILE\fR\&.\&.\&.
-.SH "DESCRIPTION"
-.PP
-\fBapple_rm\fR
-is a perl script that removes FILE(s) as well as the \&.AppleDouble metadata file(s) that corresponds to FILE(s)\&. These AppleDouble header files eventually also contain the resource fork if the files had one\&.
-\fBapple_rm\fR
-does not delete directories\&.
-.SH "EXAMPLES"
-.PP
-\fB:BINDIR:/apple_rm\fR
-test\&.text
-.PP
-\fB:BINDIR:/apple_rm\fR
-test\&.text testing\&.text
-.SH "REPORTING BUGS"
-.PP
-Report bugs to the Netatalk\-devel list <netatalk\-devel@lists\&.sourceforge\&.net>\&.
-.SH "SEE ALSO"
-.PP
-\fBapple_cp\fR(1),
-\fBapple_mv\fR(1)\&.