diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | updater.pl | 23 |
3 files changed, 20 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = cewe-fotobuch pkgdesc = an offline client for creating photobooks, uploading and ordering them at cewe.de pkgver = 6.3.3 - pkgrel = 1 + pkgrel = 2 url = http://www.cewe.de/ install = cewe-fotobuch.install arch = i686 @@ -16,7 +16,7 @@ pkgbase = cewe-fotobuch source = https://dls.photoprintit.com/download/Data/16523-de_DE/hps/setup_Mein_CEWE_FOTOBUCH.tgz source = updater.pl md5sums = 638a766051d95e3f1d94d77d2e4db5a2 - md5sums = 422a405d520e18ef9afade2e7c24440b + md5sums = 11e395d7c48d7f340435eeb938bcb502 pkgname = cewe-fotobuch @@ -10,10 +10,10 @@ pkgname=cewe-fotobuch conflicts=(cewe-fotoservice) pkgdesc='an offline client for creating photobooks, uploading and ordering them at cewe.de' md5sums=('638a766051d95e3f1d94d77d2e4db5a2' - '422a405d520e18ef9afade2e7c24440b') + '11e395d7c48d7f340435eeb938bcb502') pkgver=6.3.3 -pkgrel=1 +pkgrel=2 url="http://www.cewe.de/" license=("custom:eula") depends=('libx11' 'libjpeg' 'curl' 'wget') @@ -41,8 +41,8 @@ package() { # don't clear screen, fail to update system mime database, install broken desktop file, or burble sed -i 's/^\s*\(system("clear"\|system("update-mime-database \|createDesktopShortcuts(\|printf(\$TRANSLATABLE\).*;//' install.pl - # don't show EULA/ask for confirmation if package is already installed - which $pkgname &>/dev/null && update='--update' + # 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' @@ -58,7 +58,7 @@ package() { cd ${_installDir#$pkgdir} # nouveau bug with QT web engine: https://bugreports.qt.io/browse/QTBUG-41242 lsmod | grep nouveau && export QT_XCB_FORCE_SOFTWARE_OPENGL=1 - exec ./"$_productUrname" "\$@" + exec ./"${_productUrname/_/.}" "\$@" EOF cat > $pkgdir/usr/share/applications/$pkgname.desktop <<-EOF [Desktop Entry] diff --git a/updater.pl b/updater.pl index 26dfaa430d0b..2fb5a9d80c7f 100644 --- a/updater.pl +++ b/updater.pl @@ -10,17 +10,20 @@ my $installer = ""; GetOptions("installer=s" => \$installer); -die "\033[1;31mNo AUR package available for this update.\033[0m" - unless $installer =~ /(OnlineFotoservice|Mein_CEWE_FOTOBUCH)/; +unless ($installer =~ /(cewe-fotoservice|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-fotoservice'; + my $pkgName = $1 eq 'Mein_CEWE_FOTOBUCH' ? 'cewe-fotobuch' : 'cewe-fotoservice'; -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/$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'); + chdir($pkgName); + system("mv '$installer' ./"); + system('_UPDATING=1 makepkg --install --clean --skipchecksums'); +} -print "\nSie können dieses Fenster jetzt schließen.\n"; +print "\nDrücken Sie <ENTER> um dieses Fenster zu schließen.\n"; +my $input = <STDIN>; |