[arch-commits] Commit in unetbootin/trunk (4 files)

[Alexander Rødseth]

    Date: Sunday, May 29, 2016 @ 11:05:56
  Author: arodseth
Revision: 177406

upgpkg: unetbootin 625-1

Added:
  unetbootin/trunk/unetbootin.sh
Modified:
  unetbootin/trunk/PKGBUILD
Deleted:
  unetbootin/trunk/unetbootin.sh
  unetbootin/trunk/unetbootin_polkit.sh

----------------------+
 PKGBUILD             |   13 +++++--------
 unetbootin.sh        |   14 +++++++++++---
 unetbootin_polkit.sh |   11 -----------
 3 files changed, 16 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-29 07:07:30 UTC (rev 177405)
+++ PKGBUILD	2016-05-29 09:05:56 UTC (rev 177406)
@@ -5,8 +5,8 @@
 # Contributor: Michai Coman <mihai at m1x.ro>
 
 pkgname=unetbootin
-pkgver=619
-pkgrel=2
+pkgver=625
+pkgrel=1
 arch=('x86_64' 'i686')
 license=('GPL')
 pkgdesc='Create bootable Live USB drives'
@@ -17,17 +17,15 @@
             'zenity: display an error if no authentication agent is found')
 source=("git://github.com/$pkgname/$pkgname.git#tag=$pkgver"
         'org.archlinux.pkexec.unetbootin.policy'
-        'unetbootin_polkit.sh'
         'unetbootin.sh')
 sha256sums=('SKIP'
             'fa9bb53d90cb10a0ab8dd317ed6a3506b228b0e26ed2ed8b108b5990f641641a'
-            '6399c6a44b270a4ec67a36e3914c7c2f47a9008efb0133a33f92d9ad4284cc57'
-            'c59c486c0e74fbb23b842c28328937d8c2f8bbf00428711e33dec900a3a7140c')
+            '6399c6a44b270a4ec67a36e3914c7c2f47a9008efb0133a33f92d9ad4284cc57')
 
 prepare() {
   cd "$pkgname/src/$pkgname"
 
-  setconf unetbootin.desktop Exec /usr/bin/unetbootin_polkit
+  setconf unetbootin.desktop Exec /usr/bin/unetbootin
 }
 
 build() {
@@ -53,8 +51,7 @@
 
   cd "$srcdir"
 
-  install -m755 "${pkgname}_polkit.sh" "$pkgdir/usr/bin/${pkgname}_polkit"
-  install -m755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
+  install -m755 "${pkgname}.sh" "$pkgdir/usr/bin/$pkgname"
 
   # Polkit policy
   install -Dm644 'org.archlinux.pkexec.unetbootin.policy' \

Deleted: unetbootin.sh
===================================================================
--- unetbootin.sh	2016-05-29 07:07:30 UTC (rev 177405)
+++ unetbootin.sh	2016-05-29 09:05:56 UTC (rev 177406)
@@ -1,3 +0,0 @@
-#!/bin/sh
-# See FS#42030 for more information about the QT_X11_NO_MITSHM=1 workaround
-QT_X11_NO_MITSHM=1 /usr/bin/unetbootin.elf "$@"

Added: unetbootin.sh
===================================================================
--- unetbootin.sh	                        (rev 0)
+++ unetbootin.sh	2016-05-29 09:05:56 UTC (rev 177406)
@@ -0,0 +1,11 @@
+#!/bin/bash
+export QT_X11_NO_MITSHM=1
+if [ $(which pkexec) ]; then
+  pkexec --disable-internal-agent "/usr/bin/unetbootin.elf" "$@" 2>/tmp/_polkit_error
+  if [ -s /tmp/_polkit_error ]; then
+    zenity --error --text="`cat /tmp/_polkit_error`"
+    rm /tmp/_polkit_error
+  fi
+else
+  /usr/bin/unetbootin.elf "$@"
+fi

Deleted: unetbootin_polkit.sh
===================================================================
--- unetbootin_polkit.sh	2016-05-29 07:07:30 UTC (rev 177405)
+++ unetbootin_polkit.sh	2016-05-29 09:05:56 UTC (rev 177406)
@@ -1,11 +0,0 @@
-#!/bin/bash
-export QT_X11_NO_MITSHM=1
-if [ $(which pkexec) ]; then
-  pkexec --disable-internal-agent "/usr/bin/unetbootin.elf" "$@" 2>/tmp/_polkit_error
-  if [ -s /tmp/_polkit_error ]; then
-    zenity --error --text="`cat /tmp/_polkit_error`"
-    rm /tmp/_polkit_error
-  fi
-else
-  /usr/bin/unetbootin.elf "$@"
-fi