SVN: toys/rsget.pl: Makefile RSGet/Curl.pm

[pawelz]

Author: pawelz
Date: Mon Jun 28 12:56:26 2010
New Revision: 11613

Modified:
   toys/rsget.pl/Makefile
   toys/rsget.pl/RSGet/Curl.pm
Log:
- Don't use '{,}'. It does not work on dash, which is default shell on ubuntu.
- BTW: is '{,}' bashizm? Or dash misses some POSIX shell features?


Modified: toys/rsget.pl/Makefile
==============================================================================
--- toys/rsget.pl/Makefile	(original)
+++ toys/rsget.pl/Makefile	Mon Jun 28 12:56:26 2010
@@ -10,7 +10,7 @@
 endif
 
 PLUGIN_DIRS = Get Video Audio Image Link Direct
-DIRS = RSGet,Get,Video,Audio,Image,Link,Direct,data
+DIRS = RSGet Get Video Audio Image Link Direct data
 
 export LC_ALL=C
 
@@ -22,7 +22,9 @@
 else
 pkg: clean
 	rm -rf $(PKGDIR)
-	install -d $(PKGDIR)/{$(DIRS)}
+	for DIR in $(DIRS); do \
+		install -d $(PKGDIR)/$$DIRS; \
+	done
 	install rsget.pl $(PKGDIR)
 	cp Makefile README README.config README.requirements $(PKGDIR)
 	cp RSGet/*.pm $(PKGDIR)/RSGet
@@ -35,7 +37,10 @@
 endif
 
 install: clean
-	install -d $(DESTDIR)$(DATADIR)/{$(DIRS)} $(DESTDIR)$(BINDIR)
+	for DIR in $(DIRS); do \
+		install -d $(DESTDIR)$(DATADIR)/$$DIR; \
+	done
+	install -d $(DESTDIR)$(BINDIR)
 	sed '$(SETINTERPRETER) s#\($$install_path\) =.*;#\1 = "$(DATADIR)";#' \
 		< rsget.pl > rsget.pl.datadir
 	install rsget.pl.datadir $(DESTDIR)$(BINDIR)/rsget.pl
@@ -48,7 +53,12 @@
 
 .PHONY: clean
 clean:
-	rm -fv {$(DIRS),.}/*~
-	rm -fv {$(DIRS),.}/.*~
-	rm -fv {$(DIRS),.}/svn-commit.tmp*
+	for DIR in $(DIRS); do \
+		rm -fv $$DIR/*~; \
+		rm -fv $$DIR/.*~; \
+		rm -fv $$DIR/svn-commit.tmp*; \
+	done
+	rm -fv ./*~ \
+	rm -fv ./.*~ \
+	rm -fv ./svn-commit.tmp* \
 	rm -fv rsget.pl.datadir

Modified: toys/rsget.pl/RSGet/Curl.pm
==============================================================================
--- toys/rsget.pl/RSGet/Curl.pm	(original)
+++ toys/rsget.pl/RSGet/Curl.pm	Mon Jun 28 12:56:26 2010
@@ -60,7 +60,7 @@
 my $curl_multi = new WWW::Curl::Multi;
 
 my $curl_headers = [
-	'User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.10) Gecko/2009042316 Firefox/3.0.10',
+	'User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-US) AppleWebKit/532.9 (KHTML, like Gecko) Chrome/5.0.307.9 Safari/532.9',
 	'Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5',
 	'Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7',
 	'Accept-Language: en-us,en;q=0.5',