Update to 6.0.5-2

4 files changed, 106 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c3530624e78..6f257973ab40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb  4 19:51:28 UTC 2016
+# Sat Nov  5 13:25:53 UTC 2016
 pkgbase = cewe-monlivrephoto
-	pkgdesc = Création off-line de livres photos, commandables ensuite en ligne auprès de la FNAC
+	pkgdesc = Création off-line de livres photos, disponibles ensuite en ligne auprès de divers prestataires
 	pkgver = 6.0.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.livrephoto-cewe.fr/
 	install = cewe-monlivrephoto.install
 	arch = i686
@@ -15,11 +15,13 @@ pkgbase = cewe-monlivrephoto
 	depends = curl
 	depends = wget
 	conflicts = cewe-fotobuch
-	source = http://dls.photoprintit.com/download/Data/18455/hps/setup_Atelier_Photo_FNAC.tgz
-	source = cewe-monlivrephoto.desktop
+	conflicts = cewe-fotoservice
+	conflicts = mullerfoto-fotostar_de
+	source = http://dls.photoprintit.com/download/Data/14227/hps/setup_Mon_LIVRE_PHOTO_CEWE.tgz
+	source = updater.pl
 	source = cewe-monlivrephoto.install
 	md5sums = SKIP
-	md5sums = a6b82116c19dcca0b5d8ac74707d8938
+	md5sums = 2a3ccb8cbbb4c45c5b634efce189bcaa
 	md5sums = 82baecba5be4c2af0cccf0f5bc0e00c7
 
 pkgname = cewe-monlivrephoto
diff --git a/PKGBUILD b/PKGBUILD
index 46bc362a6ee8..4c5af84267c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,85 @@
-# Contributor: Jozef Riha <jose1711 at gmail dot com>
-# Updated by Manuel Conzelmann, changed to non-branded software
+# Maintainer: zoe chp321 at gmail com>
+# forked from cewe-fotoservice by James Crompton, itself forked from cewe-fotobuch, originally by Jozef Riha, updated by Manuel Conzelmann
 # Updated by Zoe <chp321 at gmail dot com>, for french version
-# Maintainer: zoe <chp321@gmail.com>
+
+_keyaccount=14227
+_productUrname='Mon LIVRE PHOTO CEWE'
+_productRename='LIVRE PHOTO CEWE'
+_setupFilename='setup_Mon_LIVRE_PHOTO_CEWE'
 
 pkgname=cewe-monlivrephoto
+conflicts=('cewe-fotobuch' 'cewe-fotoservice' 'mullerfoto-fotostar_de')
+pkgdesc="Création off-line de livres photos, disponibles ensuite en ligne auprès de divers prestataires"
+# setup_Mon_LIVRE_PHOTO_CEWE (script perl) is versatile too much, so it is better to skip its md5sum :
+md5sums=(SKIP
+         '2a3ccb8cbbb4c45c5b634efce189bcaa'  ## updater.pl
+         '82baecba5be4c2af0cccf0f5bc0e00c7') ## $pkgname.install
+
 pkgver=6.0.5
-pkgrel=1
-pkgdesc="Création off-line de livres photos, commandables ensuite en ligne auprès de la FNAC"
+pkgrel=2
 url="http://www.livrephoto-cewe.fr/"
 license=("custom:eula")
 depends=('libx11' 'libjpeg' 'curl' 'wget')
 makedepends=('unzip')
-conflicts=('cewe-fotobuch')
 arch=('i686' 'x86_64')
-source=("http://dls.photoprintit.com/download/Data/18455/hps/setup_Atelier_Photo_FNAC.tgz"         
-"$pkgname.desktop" "$pkgname.install")
+source=("http://dls.photoprintit.com/download/Data/$_keyaccount/hps/$_setupFilename.tgz"
+	'updater.pl' "$pkgname.install")
 install=$pkgname.install
-# setup_Atelier_Photo_FNAC.tgz (script perl) is versatile too much, so it is better to skip its md5sum :
-md5sums=(SKIP 'a6b82116c19dcca0b5d8ac74707d8938' '82baecba5be4c2af0cccf0f5bc0e00c7')
+_installDir=/usr/share/$pkgname
+
+##########################################
+# remaining code shared with cewe-fotoservice
+
+pkgver() {
+	grep 'my $HPS_VER' $srcdir/install.pl | grep -Po '[\d\.]+'
+}
 
 package() {
-        cd $srcdir
-        mkdir -p $pkgdir/usr/{share/$pkgname,bin}
-        ./install.pl --installDir=$pkgdir/usr/share/$pkgname --workingDir=$srcdir -k -v
-        # create startup script
-        (echo "#!/bin/bash
-cd /usr/share/$pkgname
-./$pkgname \"\$@\"") > $pkgdir/usr/bin/$pkgname
-        chmod 755 $pkgdir/usr/bin/$pkgname
-        # utf-8 and space in executable filenames is generally a bad idea
-        cd $pkgdir/usr/share/$pkgname
-        mv "Atelier Photo FNAC" "$pkgname"
-        # create desktop shortcut
-        install -D -m644 $pkgdir/usr/share/$pkgname/Resources/keyaccount/32.xpm $pkgdir/usr/share/pixmaps/$pkgname.xpm && \
-        install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop || return 1
+	# put icons and mimetype in the right place
+	export XDG_UTILS_INSTALL_MODE=system
+	export XDG_DATA_DIRS="$pkgdir/usr/share:"
+
+	_installDir=$pkgdir$_installDir
+	mkdir -p $_installDir $pkgdir/usr/{bin,share/icons/hicolor,share/mime/packages,share/applications}
+
+	cd $srcdir
+	# don't clear screen, install broken desktop file, or burble
+	sed -i 's/^\(system("clear"\|createDesktopShortcuts(\|printf(\$TRANSLATABLE\).*;//' install.pl
+
+	# don't show EULA/ask for confirmation if package is already installed
+	which $pkgname &>/dev/null && update='--update'
+	# keep packages unless updating from within application
+	[[ -z "$_UPDATING" ]] && keepPackages='-k' || update='--upgrade'
+
+	./install.pl $update $keepPackages --installDir=$_installDir -v
+	install -m644 -b updater.pl $_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
+
+	# create startup script and desktop file
+	cat > $pkgdir/usr/bin/$pkgname <<-EOF
+		#!/usr/bin/bash
+		cd ${_installDir#$pkgdir}
+		KDEHOME=\$HOME/.kde4 exec ./"$_productUrname" "\$@"
+	EOF
+	cat > $pkgdir/usr/share/applications/$pkgname.desktop <<-EOF
+		[Desktop Entry]
+		Type=Application
+		Name=$_productRename
+		Comment=Offline client for cewe.fr service, french version
+		Exec=$pkgname
+		Icon=hps-$_keyaccount
+		StartupNotify=true
+		Categories=Graphics;Photography;
+		MimeType=application/x-hps-mcf
+	EOF
+	chmod 755 $pkgdir/usr/bin/$pkgname $pkgdir/usr/share/applications/$pkgname.desktop
+
+	# adjust product name in mimetype comment
+	sed -i "s/$_productUrname/$_productRename/" $pkgdir/usr/share/mime/packages/*
+	# remove unneeded mime cache files and installation logs
+	rm -d $pkgdir/usr/share/mime/application/* $pkgdir/usr/share/mime/* \
+		$_installDir/.log/* $_installDir/.log &> /dev/null || true
+	echo
 }
diff --git a/cewe-monlivrephoto.desktop b/cewe-monlivrephoto.desktop
deleted file mode 100644
index f1e153e4c1e8..000000000000
--- a/cewe-monlivrephoto.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=CeWe Mon livre photos
-Comment=Offline client for cewe.de service - Version française
-Exec=cewe-monlivrephoto
-Icon=cewe-monlivrephoto
-StartupNotify=true
-Categories=Graphics;Photography;
diff --git a/updater.pl b/updater.pl
new file mode 100644
index 000000000000..f4bbfadb8117
--- /dev/null
+++ b/updater.pl
@@ -0,0 +1,26 @@
+#! /usr/bin/perl -w
+
+################################################################################
+# Replacement updater script for AUR package
+################################################################################
+use strict;
+use Getopt::Long;
+
+my $installer = "";
+
+GetOptions("installer=s" => \$installer);
+
+die "\033[1;31mNo AUR package available for this update.\033[0m"
+	unless $installer =~ /(OnlineFotoservice|Mein_CEWE_FOTOBUCH|Mon_LIVRE_PHOTO_CEWE)/;
+
+my $pkgName = $1 eq 'Mein_CEWE_FOTOBUCH' ? 'cewe-fotobuch' : 'cewe-fotoservice' : 'cewe-monlivrephoto';
+
+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($pkgName);
+system("mv '$installer' ./");
+system('_UPDATING=1 makepkg --install --clean --skipchecksums');
+
+print "\nNow you can close this window\n";