Restored `properties.ini` and further package review

1 files changed, 41 insertions, 26 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9b279596bfbf..50f422d86f46 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,10 @@
 
 pkgname='xampp'
 pkgver='7.4.10'
-pkgrel=6
+pkgrel=7
 pkgdesc='A stand-alone LAMPP distribution'
+_platform='linux-x64'
+_uppkgrel=0
 url='https://www.apachefriends.org/'
 license=('GPL')
 arch=('x86_64')
@@ -19,6 +21,7 @@ optdepends=('polkit: for launching XAMPP Manager and Control Panel from menu'
 makedepends=('sdx' 'tclkit' 'rsync')
 source=('bitrock-unpacker.tcl'
 	'org.freedesktop.xampp-manager.policy'
+	'properties.ini.in'
 	'xampp.service'
 	'xampp.svg'
 	'xampp.sysusers'
@@ -27,18 +30,19 @@ source=('bitrock-unpacker.tcl'
 	'xampp-control-panel.desktop'
 	'xampp-manager'
 	'xampp-manager.desktop')
-source_x86_64=("${url}/${pkgname}-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run")
-options=(!strip)
+source_x86_64=("${url}/${pkgname}-files/${pkgver}/${pkgname}-${_platform}-${pkgver}-${_uppkgrel}-installer.run")
+options=(staticlibs libtool !strip)
 install='xampp.install'
 sha256sums=('3f262ef4b3e752992667ab482cbf364e3b9e6f95b4b6fb12a1ce6fa7a88f124e'
             '4092631d86ec1c3a155bfec76ea2c8433426a13f12a7a5866f843a099f1ca418'
+            'db911d689c2b78d02b3829cabf03822bb213d21dfa557f388989e10e837860bc'
             '78854cb427117c69117a8f20685acbe898a02bc3af1409950117986ff1b45f1f'
             'a3fc7f2b570af9d05435f2f9a0b8d7d9b30ee1dbeaea152f8e249ef5ef0461c9'
             '37e24dacf3a52037d0cddb11d979917f81741bf399ec5fa5e847359909b7bc25'
             'abdd8e08dc12b1cc57f430460b4653d2b76c53c43f113635983c98e59769ee63'
-            'aadc86347958f83165afdcf3b65e08c9b9ead4fa1356bb9fa328dbb4c17a78cf'
-            '82017853d6a50a53fde31deef4746c63d246e660597daca6986f6ac16dac0801'
-            'e0bfd1590ac26dc6986b5c8d2d03f9899ddd742fe2e978c95f7ed5b58c629688'
+            'd6135f2f5f089b6293d4d2e87072ec63071e8f76c40e1e2642ed27812c84318c'
+            '6451a2e210a7d4d807618c7042a966343cc346ec860680d777b463c30026057e'
+            '6fa0e2ce22b51d5c611ff0b4179fc3bdf575a2cd3c69f2dd9f0d4dd6e3ab8814'
             '584f891f908aa5ea95c9a19d4298c1a582e81fcace3ab0741cbd3f4fac33128a')
 sha256sums_x86_64=('dc216c55f99b04a9e1a458c7c881127fdbf30963710a32f6d5228a09c3cde722')
 
@@ -48,8 +52,10 @@ prepare() {
 	cd "${srcdir}"
 
 	msg 'Extracting package...'
-        "${srcdir}/bitrock-unpacker.tcl" "${srcdir}/${pkgname}-linux-x64-${pkgver}-0-installer.run" \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}"
+	chmod +x "${srcdir}/bitrock-unpacker.tcl"
+	rm -rf "${srcdir}/${pkgname}-${_platform}-${pkgver}"
+        "${srcdir}/bitrock-unpacker.tcl" "${srcdir}/${pkgname}-${_platform}-${pkgver}-0-installer.run" \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}"
 
 }
 
@@ -60,16 +66,21 @@ package() {
 	msg 'Recreating package tree...'
 	install -dm755 "${pkgdir}/opt/lampp"
 	rsync -azq --remove-source-files \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/xampp_core_files/xampp_core_folder"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/xampp_developer_files/xampp_developer_folder"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/native_apache_adapter/apache_xampp_linux"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/native_proftpd_adapter/proftpd_xampp_linux"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/native_mysql_adapter/mysql_xampp_linux"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/manager/binary"/. \
-		"${srcdir}/${pkgname}-linux-x64-${pkgver}/common_native_adapter/common"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/xampp_core_files/xampp_core_folder"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/xampp_developer_files/xampp_developer_folder"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/native_apache_adapter/apache_xampp_linux"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/native_proftpd_adapter/proftpd_xampp_linux"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/native_mysql_adapter/mysql_xampp_linux"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/manager/binary"/. \
+		"${srcdir}/${pkgname}-${_platform}-${pkgver}/common_native_adapter/common"/. \
 		"${pkgdir}/opt/lampp"
 
-	rm -rf "${srcdir}/${pkgname}-linux-x64-${pkgver}"
+	rm "${pkgdir}/opt/lampp/ctlscript.bat" "${pkgdir}/opt/lampp/killprocess.bat"
+
+	# Set root location in all files
+	msg 'Setting root location globally (it might take a few minutes)...'
+	find "${pkgdir}/opt/lampp/" -type f \
+		-exec sed -i 's/\@\@BITNAMI_XAMPP_ROOT\@\@/\/opt\/lampp/gI;s/\@\@BITROCK_INSTALLDIR\@\@/\/opt\/lampp/gI' '{}' \;
 
 	# Temp folders
 	install -dm777 "${pkgdir}/opt/lampp/phpmyadmin/tmp"
@@ -79,15 +90,19 @@ package() {
 	#msg 'Configuring phpMyAdmin settings for MySQL...'
 	#find "${pkgdir}/opt/lampp/phpmyadmin" -type f -exec sed -i 's/localhost/localhost:3306/gI' '{}' \;
 
-	# Links
-	install -dm755 "${pkgdir}/opt/lampp/share/lampp"
-	ln -sf '/opt/lampp/xampp' "${pkgdir}/opt/lampp/lampp"
-	ln -sf '/opt/lampp/share/xampp/' "${pkgdir}/opt/lampp/share/lampp/"
+	# Links and missing files
+	ln -s '/opt/lampp/xampp' "${pkgdir}/opt/lampp/lampp"
+	test -d "${pkgdir}/opt/lampp/share/lampp" || \
+		ln -sf '/opt/lampp/share/xampp' "${pkgdir}/opt/lampp/share/lampp"
 
-	# Set root location in all files
-	msg 'Setting root location globally (it might take a few minutes)...'
-	find "${pkgdir}/opt/lampp/" -type f \
-		-exec sed -i 's/\@\@BITNAMI_XAMPP_ROOT\@\@/\/opt\/lampp/gI;s/\@\@BITROCK_INSTALLDIR\@\@/\/opt\/lampp/gI' '{}' \;
+	sed \
+		"
+			s/@STACK_VERSION@/${pkgver}-${_uppkgrel}/g
+			s/@PLATFORM@/${_platform}/g
+		" \
+		"${srcdir}/properties.ini.in" > "${pkgdir}/opt/lampp/properties.ini"
+
+	echo -n "${pkgver}-${_uppkgrel}" > "${pkgdir}/opt/lampp/lib/VERSION"
 
 	# For using MariaDB from the official packages (currently unused option)
 	#find "${pkgdir}/opt/lampp/mysql/scripts" -type f -exec sed -i 's/\/opt\/lampp\/var\/mysql\/$HOSTNAME.pid/\/var\/lib\/mysql\/$HOSTNAME.pid/gI' '{}' \;
@@ -101,13 +116,13 @@ package() {
 	# Licenses
 	install -dm755 "${pkgdir}/usr/share/licenses"
 	chmod -R a+rX,u+w "${pkgdir}/opt/lampp/licenses"
-	ln -sf "/opt/lampp/licenses" "${pkgdir}/usr/share/licenses/xampp"
+	ln -s "/opt/lampp/licenses" "${pkgdir}/usr/share/licenses/xampp"
 
 	# Executables
 	install -dm755 "${pkgdir}/usr/bin"
 	install -Dm755 "${srcdir}/xampp-manager" "${pkgdir}/usr/bin/xampp-manager"
 	install -Dm755 "${srcdir}/xampp-control-panel" "${pkgdir}/usr/bin/xampp-control-panel"
-	ln -sf '/opt/lampp/lampp' "${pkgdir}/usr/bin/xampp"
+	ln -s '/opt/lampp/xampp' "${pkgdir}/usr/bin/xampp"
 
 	# Systemd files
 	install -dm755 "${pkgdir}/etc/systemd/system"