Change upstream URL, improve build() function, change name of created .jar file to lower case

2 files changed, 33 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba7853038b45..1990dfbeae03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = getgarfield
 	pkgdesc = Java application that downloads all Garfield comic strips
 	pkgver = 0.1.3
-	pkgrel = 1
-	url = http://eomanis.mooo.com/permshare/getgarfield/index.xhtml
+	pkgrel = 2
+	url = https://eomanis.duckdns.org/permshare/getgarfield/index.xhtml
 	arch = any
 	license = GPL3
 	makedepends = java-environment>=8
 	depends = java-runtime-headless>=8
 	depends = bash
-	source = http://eomanis.mooo.com/permshare/getgarfield/getgarfield-0.1.3.tar.gz
+	source = https://eomanis.duckdns.org/permshare/getgarfield/getgarfield-0.1.3.tar.gz
 	sha384sums = 02c766398513f3a1cd02dbcba348bbe5d1ec2535e91f2dc790d92cdb0ffd7f4b579daba45cac453839c926cbfe090e73
 
 pkgname = getgarfield
diff --git a/PKGBUILD b/PKGBUILD
index 066c79501cb2..4bdf9ee0e73a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,48 +3,55 @@
 pkgname='getgarfield'
 pkgverUpstream="0.1.3"
 pkgver="${pkgverUpstream//-/.}"
-pkgrel=1
+pkgrel=2
 pkgdesc="Java application that downloads all Garfield comic strips"
 arch=('any')
-url='http://eomanis.mooo.com/permshare/getgarfield/index.xhtml'
+url='https://eomanis.duckdns.org/permshare/getgarfield/index.xhtml'
 license=('GPL3')
 depends=('java-runtime-headless>=8' 'bash')
 makedepends=('java-environment>=8')
-source=("http://eomanis.mooo.com/permshare/getgarfield/getgarfield-${pkgverUpstream}.tar.gz")
+source=("https://eomanis.duckdns.org/permshare/getgarfield/getgarfield-${pkgverUpstream}.tar.gz")
 sha384sums=('02c766398513f3a1cd02dbcba348bbe5d1ec2535e91f2dc790d92cdb0ffd7f4b579daba45cac453839c926cbfe090e73')
 
 build() {
     local IFS=$'\n'
+    local programEntryPoint="getgarfield.GetGarfield"
+    local -a jarItemsArgs
     
     # Create a clean jar directory representing the contents of the .jar
     # file that is being built
     rm -rf jar
     mkdir -p jar
+    
+    # Populate the jar directory
+    echo "Preparing temporary .jar directory" >&2
+    # Copy everything from the src subdirectory into jar
+    rsync -rWtl "${pkgname}-${pkgverUpstream}/src/" jar
+    # Copy all top-level items from the sources directory into jar
+    # except the src subdirectory and any .hidden files
+    find "${pkgname}-${pkgverUpstream}" -mindepth 1 -maxdepth 1 -not -name 'src' -not -name '.*' -exec rsync -rWtl '{}' jar ';'
+    
     # Compile the sources to .class files into jar
     echo "Compiling java sources" >&2
-    javac -classpath "" -d jar -encoding UTF-8 -source 8 \
-        $(find "${pkgname}-${pkgverUpstream}/src" -type f -name '*.java' -print)
-    # Add the other resources to jar, such as the web site templates
-    echo "Copying required resources, sources and info files" >&2
-    cp --verbose --recursive --target-directory jar \
-        "${pkgname}-${pkgverUpstream}/src/getgarfield" \
-        "${pkgname}-${pkgverUpstream}/COPYING" \
-        "${pkgname}-${pkgverUpstream}/README" \
-        1>&2
+    javac -source 8 -classpath "" -d jar -encoding UTF-8 \
+        $(find jar -type f -name '*.java' -print)
     
     # Create a versioned runnable .jar file containing the contents of
-    # the jar directory and having the program correct entry point
-    echo "Creating GetGarfield-${pkgver}.jar" >&2
-    jar ce getgarfield.GetGarfield \
-        -C jar getgarfield \
-        -C jar COPYING \
-        -C jar README \
-        > "GetGarfield-${pkgver}.jar"
+    # the jar directory and having the correct program entry point
+    echo "Creating getgarfield-${pkgver}.jar" >&2
+    while read -rs item; do
+        jarItemsArgs+=( -C )
+        jarItemsArgs+=( jar )
+        jarItemsArgs+=( "$item" )
+    done < <(find jar -mindepth 1 -maxdepth 1 -printf '%P\n')
+    jar ce "$programEntryPoint" \
+        "${jarItemsArgs[@]}" \
+        > "getgarfield-${pkgver}.jar"
     
     # Create a bash launcher
     echo -n \
 '#!/bin/bash
-/usr/bin/java -jar "$(dirname "$0")"/GetGarfield.jar "$@"
+/usr/bin/java -jar "$(dirname "$0")"/getgarfield.jar "$@"
 '       > getgarfield
 }
 
@@ -53,9 +60,9 @@ package() {
     cd "${pkgdir}/usr/bin"
     
     # Place the .jar file and create a non-versioned symlink to it
-    cp --target-directory . "${srcdir}/GetGarfield-${pkgver}.jar"
-    chmod u=rwx,go=rx "GetGarfield-${pkgver}.jar"
-    ln -s "/usr/bin/GetGarfield-${pkgver}.jar" "GetGarfield.jar"
+    cp --target-directory . "${srcdir}/getgarfield-${pkgver}.jar"
+    chmod u=rwx,go=rx "getgarfield-${pkgver}.jar"
+    ln -s "/usr/bin/getgarfield-${pkgver}.jar" "getgarfield.jar"
     
     # Place the bash launcher
     cp --target-directory . "${srcdir}/getgarfield"