X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tar.php;h=2535a90df8697703b0797b649718e838e12cbacb;hb=19f414ad930c8b98149a2d22c6b319983392c8c0;hp=f514a6b95df47e510d28761b6fa9f4892327df6b;hpb=22d5fb7ab7d4ee86bd59e194387dca268bd577a1;p=wfpl.git

diff --git a/tar.php b/tar.php
index f514a6b..2535a90 100644
--- a/tar.php
+++ b/tar.php
@@ -2,21 +2,18 @@
 
 #  Copyright (C) 2006 Jason Woofenden
 #
-#  This file is part of wfpl.
-#
-#  wfpl is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-#  wfpl is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#  FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with wfpl; if not, write to the Free Software Foundation, Inc., 51
-#  Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+#  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 3 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 or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # This file is for making a tar archive out of some strings you pass. See
@@ -50,11 +47,22 @@ function make_tar($dirname, $files, $extra = '') {
 	}
 	mkdir("$tmpdir/$dirname");
 	foreach($files as $filename => $file_data) {
+		if(substr($filename, -3) == ' ->') {
+			$filename = substr($filename, 0, -3);
+			$link = true;
+		} else {
+			$link = false;
+		}
 		$filename_fixed = ereg_replace('[^a-zA-Z0-9_.-]', '', $filename);
 		if($filename != $filename_fixed) {
 			die("Invalid filename for tar archive");
 		}
-		write_file("$tmpdir/$dirname/$filename", $file_data);
+		if($link) {
+			$target = ereg_replace('[^a-zA-Z0-9_./-]', '', $file_data);
+			system("/bin/ln -s $file_data \"$tmpdir/$dirname/$filename\"");
+		} else {
+			write_file("$tmpdir/$dirname/$filename", $file_data);
+		}
 	}
 
 	if(function_exists($extra)) {
@@ -73,9 +81,8 @@ function make_wfpl_tar($dirname, $files) {
 
 function add_wfpl_dir($dir) {
 	mkdir("$dir/code");
-	system("/bin/cp -HRp 'code/wfpl' '$dir/code/'", $return_code);
+	system("rsync -plr --exclude=\".git\" --exclude=\"*.swp\" 'code/wfpl/' '$dir/code/wfpl/'", $return_code);
 	if($return_code != 0) {
-		die("ERROR: while trying to copy wfpl into archive: cp returned $return_code");
+		die("ERROR: while trying to copy wfpl into archive: rsync returned $return_code");
 	}
-	system("/bin/rm -rf '$dir/code/wfpl/.git'");
 }