--- loncom/cgi/decompress.pl 2005/11/03 20:36:58 1.15 +++ loncom/cgi/decompress.pl 2006/05/05 21:07:19 1.16 @@ -33,9 +33,19 @@ use strict; use lib '/home/httpd/lib/perl'; use LONCAPA::loncgi; -if(! &LONCAPA::loncgi::check_cookie_and_load_env()) { - print "Content-type: text/html\n\n"; - print <NO COOKIE! END } else { @@ -53,19 +63,18 @@ END chdir($dir); my @cmd; if ($file =~ m|\.zip$|) { - @cmd = ("/usr/bin/unzip","-o"); - } elsif ($file =~ m|\.tar\.gz$|) { - @cmd = ("/usr/bin/tar","-zxpvf"); + @cmd = ($location_of{'unzip'},"-o"); + } elsif ($file =~ m|\.tar\.gz$| + || $file =~ m|\.tgz$| ) { + @cmd = ($location_of{'tar'},"-zxpvf"); } elsif ($file =~ m|\.tar\.bz2$|) { - @cmd = ("/usr/bin/tar","-jxpvf"); + @cmd = ($location_of{'tar'},"-jxpvf"); } elsif ($file =~ m|\.bz2$|) { - @cmd = ("/usr/bin/bunzip2"); - } elsif ($file =~ m|\.tgz$|) { - @cmd = ("/usr/bin/tar","-zxpvf"); + @cmd = ($location_of{'bunzip2'}); } elsif ($file =~ m|\.gz$|) { - @cmd = ("/usr/bin/gunzip"); + @cmd = ($location_of{'gunzip'}); } elsif ($file =~ m|\.tar$|) { - @cmd = ("/usr/bin/tar","-xpvf"); + @cmd = ($location_of{'tar'},"-xpvf"); } else { print("There has been an error in determining the file type of $file, please check name"); } @@ -73,7 +82,7 @@ END undef($!); undef($@); open(OUTPUT,"-|", @cmd, $file); - while () { print "$_
"; } + while (my $line = ) { print("$line
"); } close(OUTPUT); print("

Decompress complete.

"); if ($! || $@) {