Switch URLs to https

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2cc094e0b6c..ef8bf7ed8f16 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = greenfoot
 	pkgdesc = Allows easy development of two-dimensional graphical applications, such as simulations and interactive games.
 	pkgver = 3.1.0
-	pkgrel = 3
-	url = http://www.greenfoot.org
+	pkgrel = 4
+	url = https://www.greenfoot.org
 	arch = any
 	license = GPL2
 	makedepends = libarchive
@@ -11,7 +11,7 @@ pkgbase = greenfoot
 	depends = java-environment
 	depends = java-openjfx
 	noextract = Greenfoot-linux-310.deb
-	source = http://www.greenfoot.org/download/files/Greenfoot-linux-310.deb
+	source = https://www.greenfoot.org/download/files/Greenfoot-linux-310.deb
 	source = greenfoot
 	sha256sums = edf1e727386217a299e9fcd57a6d5c60a724a811d90d7ddec5fa05cc28631695
 	sha256sums = fdca5b8433e10ca99cf91c2ab863f86e740bd08a82532e01a49ba8110a15481e
diff --git a/PKGBUILD b/PKGBUILD
index c5919d07077c..c5ef485385cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,14 +5,14 @@
 
 pkgname=greenfoot
 pkgver=3.1.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows easy development of two-dimensional graphical applications, such as simulations and interactive games."
 arch=('any')
-url="http://www.greenfoot.org"
+url="https://www.greenfoot.org"
 license=('GPL2')
 depends=('sh' 'java-runtime' 'java-environment' 'java-openjfx')
 makedepends=('libarchive')
-source=("http://www.greenfoot.org/download/files/Greenfoot-linux-${pkgver//.}.deb"
+source=("https://www.greenfoot.org/download/files/Greenfoot-linux-${pkgver//.}.deb"
         'greenfoot')
 noextract=("Greenfoot-linux-${pkgver//.}.deb")
 sha256sums=('edf1e727386217a299e9fcd57a6d5c60a724a811d90d7ddec5fa05cc28631695'
@@ -27,13 +27,13 @@ mkdir -p "${pkgdir}/usr/share/java/${pkgname}"
 mkdir -p "${pkgdir}/usr/share/doc/${pkgname}"
 
 cp -r usr/share/icons "${pkgdir}/usr/share"
-cp -r usr/share/greenfoot "${pkgdir}/usr/share/java"
+cp -r "usr/share/${pkgname}" "${pkgdir}/usr/share/java"
 cp -r usr/share/doc/Greenfoot/API "${pkgdir}/usr/share/${pkgname}"
 cp -r usr/share/doc/Greenfoot/scenarios "${pkgdir}/usr/share/doc/${pkgname}"
 install -Dm644 usr/share/doc/Greenfoot/README.txt "${pkgdir}/usr/share/doc/${pkgname}/README"
 install -Dm644 usr/share/doc/Greenfoot/GREENFOOT_LICENSES.txt "${pkgdir}/usr/share/licenses/${pkgname}/GREENFOOT_LICENSES"
 install -Dm644 usr/share/doc/Greenfoot/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 install -Dm644 usr/share/doc/Greenfoot/THIRDPARTYLICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/THIRDPARTYLICENSE"
-install -Dm644 usr/share/applications/greenfoot.desktop "${pkgdir}/usr/share/applications/greenfoot.desktop"
-install -Dm755 greenfoot "${pkgdir}/usr/bin/greenfoot"
+install -Dm644 usr/share/applications/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}"
 }