summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING36
-rwxr-xr-xphotoalbum.sh3
2 files changed, 7 insertions, 32 deletions
diff --git a/COPYING b/COPYING
index 7286746..5335487 100644
--- a/COPYING
+++ b/COPYING
@@ -1,29 +1,7 @@
-# photoalbum (c) 2011, Dipl.-Inform. (FH) Paul Buetow
-#
-# E-Mail: photoalbum@mx.buetow.org
-# WWW: http://photoalbum.buetow.org
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# * Neither the name of buetow.org nor the names of its contributors may
-# be used to endorse or promote products derived from this software
-# without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED Paul Buetow ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT Paul C. Buetow BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+photoalbum (c) 2011, 2012, 2013 Paul Buetow
+
+ E-Mail: photoalbum@dev.buetow.org
+ WWW: http://photoalbum.buetow.org
+
+Photoalbum is licensed under the GNU Gerneral Public License Version 3 or later.
+
diff --git a/photoalbum.sh b/photoalbum.sh
index e579bdc..b4bd6b6 100755
--- a/photoalbum.sh
+++ b/photoalbum.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-# Small quick n dirty photo album script
-# 2011, 2012, 2013 Paul Buetow
-
source photoalbum.conf
function createdirs () {