More flexibility to allow easier packaging of other application variants

4 files changed, 95 insertions, 41 deletions

diff --git a/CEWE.install b/CEWE.install
new file mode 100644
index 000000000000..dce7fd7d492c
--- /dev/null
+++ b/CEWE.install
@@ -0,0 +1,21 @@
+post_install() {
+	cat <<-EOF
+	---------------------------------------------------
+	Diese CEWE Software ist ein Produkt und Eigentum der
+	CEWE Stiftung & Co. KGaA, Meerweg 30-32,
+	26133 Oldenburg. Die Nutzungsbedingen sind
+	in /usr/share/licenses/PACKAGE NAME/EULA.txt.
+	WENN SIE DIESE SOFTWARE INSTALLIEREN, ERKLÄREN SIE
+	SICH MIT DEN BEDINGUNGEN DIESES LIZENZABKOMMENS
+	EINVERSTANDEN.
+	---------------------------------------------------
+	This CEWE software was created by and the is the 
+	property of CEWE Stiftung & Co. KGaA, Meerweg 30-32,
+	26133 Oldenburg, Germany. Conditions of use are in
+	/usr/share/licenses/PACKAGE NAME/EULA.txt.
+	BY INSTALLING THIS SOFTWARE YOU DECLARE YOUR
+	AGREEMENT WITH THE CONDITIONS OF THIS LICENCE.
+	---------------------------------------------------
+	EOF
+
+}
diff --git a/PKGBUILD b/PKGBUILD
index 656dcdfc78f8..8c384c3704e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,70 @@
 # Maintainer: James Crompton DonJaime at freenet de
 # forked from cewe-fotobuch, originally by Jozef Riha, updated by Manuel Conzelmann
 
-_keyaccount=24441
-# what they call their package (e.g. MY CEWE TOO MANY CAPITALS: $APPLICATION_NAME in install.pl)
-_productUrname='CEWE Fotowelt'
-# what I want to call it (e.g. CEWE Sensible Name)
-_productRename='CEWE Fotowelt'
-_lang='de_DE'
+# to package a different version, change this or download a setup file and run:
+# _SETUP_FILE=<filename> makepkg
+_productVariant=Germany
+# leave this unset to get a package name based on the application name
+pkgname=
+
+conflicts=(cewe-fotobuch cewe-fotoservice cewe-monlivrephoto-fnac cewe-monlivrephoto-fr)
+pkgdesc='an offline client for creating photobooks and other photo products and ordering them from CEWE or partners'
+
+# locale, key account, original name, version, md5sum, (optional) replacement name
+_prams_Czechia=(cs_CZ 4860 'CEWE FOTOLAB fotosvet' 7.1.3 a6a2db001621a25dd36db214ce420b94 "CEWE fotosvět")
+_prams_France=(fr_FR 7884 'Logiciel de création CEWE' 7.1.3 d05b5491c95c14d32195b5d8cbc27c23)
+_prams_Fnac=(fr_FR 18455 'Atelier Photo Fnac' 7.1.3 e34b967b54520f59a8241ece3c4bc8f2)
+_prams_Fotobuch=(de_DE 16523 'Mein CEWE FOTOBUCH' 7.1.4 c4095abf2f8fd7873a007a3b2429e285 'CEWE Fotobuch')
+_prams_Germany=(de_DE 24441 'CEWE Fotowelt' 7.1.4 1f48a372a529a1c114eab8a983f6b119)
+_prams_Poland=(pl_PL 29241 'CEWE Fotoswiat' 7.1.3 18f4cb458c729cee0bffb006bcc12a51)
+_prams_Slovakia=(sk_SK 31916 'CEWE fotosvet' 7.1.3 d7b4cee0eb3ebd0d0d24b7c2d15ea868)
+_prams_UK=(en_GB 12611 'CEWE Creator' 7.1.3 7ebc546641a0417de04b8ae5e21acfa1)
 
-conflicts=(cewe-fotobuch cewe-fotoservice)
-provides=(cewe-fotoservice)
-pkgdesc='an offline client for creating photobooks and other photo products and ordering them at cewe.de or partners'
-md5sums=('28682470d9c463cea521c0f42dd22d20'
-# template start; name=cewe; version=7.1.3;
-         '12ab17737db1c55035b6e7769132f791')
+if [ -z "$_SETUP_FILE" ]
+then
+	declare -n _prams=_prams_$_productVariant
+	# replace spaces and remove any accents for setup file name
+	source="https://dls.photoprintit.com/download/Data/${_prams[1]}-${_prams[0]}/hps/setup_$(iconv -t ascii//TRANSLIT <(echo ${_prams[2]// /_})).tgz"
+else
+	mkdir -p src
+	bsdtar -xf "$_SETUP_FILE" -C src install.pl
+
+	_prams=('$FULL_LOCALE' '$KEYACCID' '$APPLICATION_NAME' '$HPS_VER' SKIP "$_RENAME")
+	for _i in {0..3}
+	do
+		_prams[_i]="$(grep -m1 "my ${_prams[_i]}" src/install.pl | grep -Po "'.*'" | grep -Po "[^']+")"
+	done
+	source="$_SETUP_FILE"
+	[ $(whoami) != root -a -z "$_UPDATING" ] && echo "parameters: (${_prams[@]:0:2} '${_prams[2]}' ${_prams[3]} $(md5sum $source | grep -Po '^[^ ]*'))"
+fi
+
+_keyaccount=${_prams[1]}
+# what they call their package (e.g. MY CEWE TOO MANY CAPITALS)
+_productUrname=${_prams[2]}
+# what I want to call it (e.g. CEWE Sensible Name)
+[ -z "${_prams[5]}" ] && _productRename="$_productUrname" || _productRename=${_prams[5]}
 
-pkgname=${_productRename,,}
+# remove accents, lowercase and replace spaces for package name
+[ -z "$pkgname" ] && pkgname="$(iconv -t ascii//TRANSLIT <(echo $_productRename))"
+pkgname=${pkgname,,}
 pkgname=${pkgname// /-}
-pkgver=7.1.3
-pkgrel=2
+sed "s/PACKAGE NAME/$pkgname/" CEWE.install > $pkgname.install
+
+pkgver=${_prams[3]}
+pkgrel=1
+source=($source 'updater.pl')
+md5sums=(${_prams[4]} 'SKIP')
+
 url="http://www.cewe.de/"
 license=("custom:eula")
 depends=('libx11' 'libjpeg' 'curl' 'wget' 'snappy')
 makedepends=('unzip' 'xdg-utils')
 arch=('i686' 'x86_64')
-source=("https://dls.photoprintit.com/download/Data/$_keyaccount-$_lang/hps/setup_${_productUrname// /_}.tgz"
-	'updater.pl')
-install=$pkgname.install
+source=($source 'updater.pl')
+install="$pkgname.install"
 
 _installDir=/usr/share/$pkgname
 
-pkgver() {
-	grep 'my $HPS_VER' $srcdir/install.pl | grep -Po '[\d\.]+'
-}
-
 package() {
 	# put icons and mimetype in the right place
 	export XDG_UTILS_INSTALL_MODE=system
@@ -49,10 +80,13 @@ package() {
 	# don't show EULA/ask for confirmation (EULA is addressed in install script)
 	update='--update'
 	# keep packages unless updating from within application
-	[[ -z "$_UPDATING" ]] && keepPackages='-k' || update='--upgrade'
+	[ -z "$_UPDATING" ] && keepPackages='-k' || update='--upgrade'
 
 	./install.pl $update $keepPackages --installDir=$_installDir -v
+
 	install -m644 -b updater.pl $_installDir/updater.pl
+	sed -i "s/APPLICATION NAME/$_productRename/" $_installDir/updater.pl
+
 	install -D -m644 $srcdir/EULA.txt $pkgdir/usr/share/licenses/$pkgname/EULA.txt
         # pixmap for legacy customised mimetypes
 	install -D -m644 $_installDir/Resources/keyaccount/32.xpm $pkgdir/usr/share/pixmaps/$pkgname.xpm
@@ -85,4 +119,3 @@ package() {
 		$_installDir/.log/* $_installDir/.log &> /dev/null || true
 	echo
 }
-# template end;
diff --git a/cewe-fotowelt.install b/cewe-fotowelt.install
index 3d0eb262edfd..195f16402294 100644
--- a/cewe-fotowelt.install
+++ b/cewe-fotowelt.install
@@ -1,13 +1,20 @@
 post_install() {
 	cat <<-EOF
 	---------------------------------------------------
-	„CEWE Fotowelt“ ist ein Produkt und Eigentum der
+	Diese CEWE Software ist ein Produkt und Eigentum der
 	CEWE Stiftung & Co. KGaA, Meerweg 30-32,
 	26133 Oldenburg. Die Nutzungsbedingen sind
 	in /usr/share/licenses/cewe-fotowelt/EULA.txt.
 	WENN SIE DIESE SOFTWARE INSTALLIEREN, ERKLÄREN SIE
 	SICH MIT DEN BEDINGUNGEN DIESES LIZENZABKOMMENS
-	EINVERSTANDEN
+	EINVERSTANDEN.
+	---------------------------------------------------
+	This CEWE software was created by and the is the 
+	property of CEWE Stiftung & Co. KGaA, Meerweg 30-32,
+	26133 Oldenburg, Germany. Conditions of use are in
+	/usr/share/licenses/cewe-fotowelt/EULA.txt.
+	BY INSTALLING THIS SOFTWARE YOU DECLARE YOUR
+	AGREEMENT WITH THE CONDITIONS OF THIS LICENCE.
 	---------------------------------------------------
 	EOF
 
diff --git a/updater.pl b/updater.pl
index 06ed9f05abd9..8d71e5586ece 100644
--- a/updater.pl
+++ b/updater.pl
@@ -7,23 +7,16 @@ use strict;
 use Getopt::Long;
 
 my $installer = "";
-
 GetOptions("installer=s" => \$installer);
 
-unless ($installer =~ /(CEWE_Fotowelt|Mein_CEWE_FOTOBUCH)/){
-	print "\033[1;31mNo AUR package available for this update ('$installer').\033[0m"
-}else{
-
-	my $pkgName = $1 eq 'Mein_CEWE_FOTOBUCH' ? 'cewe-fotobuch' : 'cewe-fotowelt';
-
-	chdir('/tmp');
-	system("wget https://aur.archlinux.org/cgit/aur.git/snapshot/$pkgName.tar.gz -O $pkgName.tar.gz");
-	system("tar -xvf $pkgName.tar.gz");
+chdir("/tmp");
+system("wget https://aur.archlinux.org/cgit/aur.git/snapshot/cewe-fotowelt.tar.gz -O cewe-fotowelt.tar.gz");
+system("tar -xf cewe-fotowelt.tar.gz");
+chdir("cewe-fotowelt");
 
-	chdir($pkgName);
-	system("mv '$installer' ./");
-	system('_UPDATING=1 makepkg --install --clean --skipchecksums');
-}
+system("mv '$installer' ./");
+$installer =~ s!.*/!!;
+system("_UPDATING=1 _SETUP_FILE=$installer _RENAME='APPLICATION NAME' makepkg --install --noconfirm --clean");
 
-print "\nDrücken Sie <ENTER> um dieses Fenster zu schließen.\n";
+print "\nHit <ENTER> to close this window.\n";
 my $input = <STDIN>;