From 2ebf1fb613e9349524ee14086cf383cd4d3a9987 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Wed, 11 Jul 2012 13:48:34 +0200 Subject: [PATCH] add htc pics --- Makefile | 6 ++---- jpg2html.sh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7b7a9cd..e3ca112 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,6 @@ 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) @@ -30,4 +28,4 @@ wtf: .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 5a6d5a0..0fcb147 100755 --- a/jpg2html.sh +++ b/jpg2html.sh @@ -1,6 +1,6 @@ #!/bin/zsh -files=(sony/DSC?????.jpg) +files=(sony/DSC?????.jpg htc/IMG_*_??????.jpg) len=${#files[@]}; touch all.tmp -- 2.25.1