add htc pics

diff --git a/Makefile b/Makefile
index 7b7a9cd0b84fd2080e6f5cf4d418795b3f3d21a6..e3ca112e377ab96bcf246edb54819572c8dd45f6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,6 @@
 SHELL := bash
 
 SHELL := bash
 

-#PICS := $(wildcard pictest/DSC?????.jpg)
-PICS := $(wildcard sony/DSC?????.jpg)
-# PICS := $(wildcard sony/DSC?????.jpg htc/IMG_*_??????.jpg)
+PICS := $(wildcard sony/DSC?????.jpg htc/IMG_*_??????.jpg)

 SMALL := $(PICS:.jpg=_small.jpg)
 THUMB := $(PICS:.jpg=_thumb.jpg)
 
 SMALL := $(PICS:.jpg=_small.jpg)
 THUMB := $(PICS:.jpg=_thumb.jpg)
 


@@ -30,4 +28,4 @@ wtf:
 
 .PHONY: all clean wtf
 clean:
 
 .PHONY: all clean wtf
 clean:

-       rm -rf sony/*_{small,thumb}.jpg sony/*.html index.html *.zip
+       rm -rf {htc,sony}/*_{small,thumb}.jpg {htc,sony}/*.html index.html *.zip

diff --git a/jpg2html.sh b/jpg2html.sh
index 5a6d5a04d58427643fdb10240fc1762d4e5b5910..0fcb14799aabe844d7751cc14a25ed97a08d2ea2 100755 (executable)
--- a/jpg2html.sh
+++ b/jpg2html.sh
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
 #!/bin/zsh
 

-files=(sony/DSC?????.jpg)
+files=(sony/DSC?????.jpg htc/IMG_*_??????.jpg)

 len=${#files[@]};
 
 touch all.tmp
 len=${#files[@]};
 
 touch all.tmp