changed default name for subdirectory from "easygg" to "gallery"

CHANGELOG.md

@@ -6,6 +6,9 @@
 
 ### Changed
 - removed "Generated by" footer
+- changed default name for subdirectory from "easygg" to "gallery", when the
+  script was in the current directory it was blocking the creation of the
+  subdirectory
 
 
 ## [0.5.1] 2018-07-10

README.md

+easyGG
+======
+
 easyGG is an automatic gallery generator.
 
-Features:
 
+Features
+--------
+
+- automatic generation of linked HTML pages with index
 - automatic image rotation based on EXIF info
 - automatic scaling for web usage
-- automatic generation of linked pages
-- index page with thumbnails
 
-The program is a Bash shell script. It uses the tools `convert` from [ImageMagick](http://www.imagemagick.org/) and [`jhead`](http://www.sentex.net/~mwandel/jhead/). If you don't have them, install them first.
 
-Because the program is so easy (hence the name) it needs no parameters. Just call it in a directory with JPG or PNG images and it will create a subdirectory with a ready to use gallery.  You can override several default options though. Call the script with parameter *--help* for help.
+Usage
+-----
+
+Just call the script from a directory with JPG or PNG images and it will create a subdirectory with a ready to use gallery. You can override several default options though. Call the script with parameter *--help* for help.
+
+See the [-> [**demo**](https://su2.info/easygg/demo/) <-] how an easyGG generated gallery looks like.
+That are pictures from a trip to the nice city Strasbourg :)
 
-To see how an easyGG generated gallery looks like, see the [demo](https://su2.info/easygg/demo/). That are pictures from a trip to the
-nice city Strasbourg :)
 
+Prerequisites
+-------------
+The program is a Bash shell script. It uses the tools `convert` from [ImageMagick](http://www.imagemagick.org/) and [`jhead`](http://www.sentex.net/~mwandel/jhead/). If you don't have them, install them first.
+
+
+License
+-------
 The software is [free software](https://www.fsf.org/about/what-is-free-software) and licensed under the [GNU GPL](https://www.gnu.org/licenses/gpl.html).
 
+
+Contact
+-------
 If you experience problems with the script or have any suggestions just [contact me](mailto:su@su2.info).
 
 Have fun,
 Stephan
+

easygg

@@ -41,7 +41,7 @@ HEADERHTML=""
 # working directory
 # all files will be put in a subdirectory of this name
 # can be changed with --subdir option
-SUBDIR="easygg"
+SUBDIR="gallery"
 
 # 0=debug (lots of info for debugging)
 # 1=info (default, normal progress info)
@@ -143,24 +143,25 @@ usage()
 Usage: easygg [OPTIONS]
 
 This program can be called without any options. It will generate a
-subdirectory named "easygg" with a ready to use gallery.
+subdirectory with a ready to use gallery.
 You can override some default options though.
 
   -t,  --title       change title of gallery
                      (default is current directory name)
-  -s,  --subdir      working directory where gallery is written
-                     (default is "easygg")
+  -s,  --subdir      subdirectory in which the gallery files are written
+                     (default is "${SUBDIR}")
   -td, --thumb-dimension
                      max dimension of thumbnail image
-                     (in pixel, default is 160)
+                     (in pixel, default is ${THUMB_DIM})
                      no side (width/height) will be longer than this. but
                      image won't be enlarged if it is smaller.
   -fd, --full-dimension
                      max dimension of full image
-                     (in pixel, default is 640)
+                     (in pixel, default is ${FULL_DIM})
                      no side (width/height) will be longer than this. but
                      image won't be enlarged if it is smaller.
   -H,  --header      HTML code to be inserted on top of each page
+                     (default: none)
   -v,  --verbose     show more debugging info
   -q,  --quiet       show only errors
   -h,  --help        shows this information

test/test.sh

@@ -34,15 +34,15 @@ cd dataset1 || exit 1
 runtest "dataset1 execution" "../../easygg 2>&1" "[ \$RET -eq 0 ] && ( echo \"\$OUTPUT\" | grep \"Finished.\" >/dev/null )"
 
 # tests if expected number of files are produced
-runtest "dataset1 files" "echo easygg/* | md5sum | grep \"14690a60ed80f7d53176e3c703fe1b68\"" "[ \$RET -eq 0 ]"
+runtest "dataset1 files" "echo gallery/* | md5sum | grep \"53a7b7811da010336ef3f1197f8d39ee\"" "[ \$RET -eq 0 ]"
 
 # tests if all *.html files produce no parsing errors
-runtest "dataset1 html validation" "xmllint --noout --valid --html easygg/*.html 2>&1" "[ \$RET -eq 0 ] && [ -z \"\$OUTPUT\" ]"
+runtest "dataset1 html validation" "xmllint --noout --valid --html gallery/*.html 2>&1" "[ \$RET -eq 0 ] && [ -z \"\$OUTPUT\" ]"
 
 # tests if all page links are generated
-runtest "dataset1 content" "grep -e '<a href=\"page_.*\\.jpg.html\"><img src=\"thumb_.*\\.jpg\"' easygg/index.html | wc -l" "[ \$RET -eq 0 ] && [ \"\$OUTPUT\" = \"16\" ]"
+runtest "dataset1 content" "grep -e '<a href=\"page_.*\\.jpg.html\"><img src=\"thumb_.*\\.jpg\"' gallery/index.html | wc -l" "[ \$RET -eq 0 ] && [ \"\$OUTPUT\" = \"16\" ]"
 
-rm -rf easygg
+rm -rf gallery
 
 
 echo "####################"