Upgpkg: 6.2.191150; fix sudo order

3 files changed, 32 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9019cd14736..9dde9f465d03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = r-linux
 	pkgdesc = File recovery utility for the ext2/ext3/ext4 file system
-	pkgver = 5.6.175721
+	pkgver = 6.2.191150
 	pkgrel = 1
 	url = https://www.r-tt.com/data_recovery_linux/
 	arch = i686
@@ -11,11 +11,12 @@ pkgbase = r-linux
 	optdepends = kdesu
 	optdepends = polkit
 	source = rlinux.sh
+	source = elevate.sh
 	sha512sums = 01ea9c642f46a35a9b90896a7b93c3b03a5256100d6a1443286a5da58fcdca0c49447a48a2a6c335ab334cb53965ed4269381ecdda94af39d2f3c8542ce2cbae
-	source_i686 = r-linux-5.6.175721-i386.deb::https://www.r-tt.com/downloads/RLinux5_i386.deb
-	sha512sums_i686 = 4201a8f1cc24a3609e9e2889ca8497de85fac04cd4d22c31a4c9fca456db88b7e0f83908daa4f87a1d082061cc8d72d6d30becf3d8bb1242735e5eaa2b8e43da
-	source_x86_64 = r-linux-5.6.175721-x64.deb::http://www.r-tt.com/downloads/RLinux5_x64.deb
-	sha512sums_x86_64 = 2a3c627426272c5fca273ff0a3bd2f9d4c78dcaf7c056d9c8ddd9aafcbeb01064ae8ca8b0becb9d21ad446e82a8c115564ed2cc48e07daa160d2567a17c863fc
+	sha512sums = a98ab704660e17f062ffa75a4e326da600fb7f6af4518dadfbb7e42673b86a521e825ab81dd28995fcf375bd609fe1522a8a48d884fe7433c8b4c2022307cb32
+	source_i686 = r-linux-6.2.191150-i386.deb::https://www.r-studio.com/downloads/RLinux6_i386.deb
+	sha512sums_i686 = a7d44454e75acf3449b8463b7a73ecb0d030959792bd50a4298a5f07a83a1cf12d084283533dd9628e226dc6eb8b6aeba16ed58fd5c1b4e5d33f5859a553ca52
+	source_x86_64 = r-linux-6.2.191150-x64.deb::https://www.r-studio.com/downloads/RLinux6_x64.deb
+	sha512sums_x86_64 = 7752e2bf21ccfb6d5d677e0582706f14d56f8a0f6d0880ca54240a2bccfb5f0afc845f002f1a4c2fa9351f763dc9b34a63d16d2d632e859af75f71bffcaacdac
 
 pkgname = r-linux
-
diff --git a/PKGBUILD b/PKGBUILD
index 3540a992b154..c7d0e33468fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jean Lucas <jean@4ray.co>
 
 pkgname=r-linux
-pkgver=5.6.175721
+pkgver=6.2.191150
 pkgrel=1
 pkgdesc="File recovery utility for the ext2/ext3/ext4 file system"
 arch=('i686' 'x86_64')
@@ -10,12 +10,13 @@ url="https://www.r-tt.com/data_recovery_linux/"
 license=('custom')
 depends=('xorg-xhost')
 optdepends=('gksu' 'kdesu' 'polkit')
-source_i686=("$pkgname-$pkgver-i386.deb::https://www.r-tt.com/downloads/RLinux5_i386.deb")
-source_x86_64=("$pkgname-$pkgver-x64.deb::http://www.r-tt.com/downloads/RLinux5_x64.deb")
-source=(rlinux.sh)
-sha512sums=('01ea9c642f46a35a9b90896a7b93c3b03a5256100d6a1443286a5da58fcdca0c49447a48a2a6c335ab334cb53965ed4269381ecdda94af39d2f3c8542ce2cbae')
-sha512sums_i686=('4201a8f1cc24a3609e9e2889ca8497de85fac04cd4d22c31a4c9fca456db88b7e0f83908daa4f87a1d082061cc8d72d6d30becf3d8bb1242735e5eaa2b8e43da')
-sha512sums_x86_64=('2a3c627426272c5fca273ff0a3bd2f9d4c78dcaf7c056d9c8ddd9aafcbeb01064ae8ca8b0becb9d21ad446e82a8c115564ed2cc48e07daa160d2567a17c863fc')
+source_i686=("$pkgname-$pkgver-i386.deb::"https://www.r-studio.com/downloads/RLinux6_i386.deb)
+source_x86_64=("$pkgname-$pkgver-x64.deb::https://www.r-studio.com/downloads/RLinux6_x64.deb")
+source=('rlinux.sh' 'elevate.sh')
+sha512sums=('01ea9c642f46a35a9b90896a7b93c3b03a5256100d6a1443286a5da58fcdca0c49447a48a2a6c335ab334cb53965ed4269381ecdda94af39d2f3c8542ce2cbae'
+            'a98ab704660e17f062ffa75a4e326da600fb7f6af4518dadfbb7e42673b86a521e825ab81dd28995fcf375bd609fe1522a8a48d884fe7433c8b4c2022307cb32')
+sha512sums_i686=('a7d44454e75acf3449b8463b7a73ecb0d030959792bd50a4298a5f07a83a1cf12d084283533dd9628e226dc6eb8b6aeba16ed58fd5c1b4e5d33f5859a553ca52')
+sha512sums_x86_64=('7752e2bf21ccfb6d5d677e0582706f14d56f8a0f6d0880ca54240a2bccfb5f0afc845f002f1a4c2fa9351f763dc9b34a63d16d2d632e859af75f71bffcaacdac')
 
 prepare() {
     bsdtar xf data.tar.gz
@@ -28,9 +29,12 @@ package() {
   install -Dm 755 rlinux.sh "$pkgdir"/usr/bin/rlinux
   cp -r usr/local/R-Linux "$pkgdir"/opt/
 
+  head -n -12 usr/local/R-Linux/bin/rlinux >"$pkgdir"/opt/R-Linux/bin/rlinux
+  cat elevate.sh >>"$pkgdir"/opt/R-Linux/bin/rlinux
+  sed -i 's|/usr/local|/opt|' "$pkgdir"/opt/R-Linux/bin/rlinux
+
   cd usr/local/R-Linux/share
   install -Dm 644 logo_48.png "$pkgdir"/usr/share/pixmaps/rtt-rlinux.png
-  sed 's|Exec=.*|Exec=rlinux|' rtt-rlinux.desktop >"$pkgdir"/usr/share/applications/rtt-rlinux.desktop
-  sed -i 's|/usr/local|/opt|' "$pkgdir"/opt/R-Linux/bin/rlinux
+  sed 's|/usr/local|/opt|' rtt-rlinux.desktop >"$pkgdir"/usr/share/applications/rtt-rlinux.desktop
   install -Dm644 rln_viewer.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/elevate.sh b/elevate.sh
new file mode 100644
index 000000000000..a4e13d1abad8
--- /dev/null
+++ b/elevate.sh
@@ -0,0 +1,12 @@
+    # Elevate (fixed)
+    if [ -x "$GKSUDO" ]; then
+         $GKSUDO --description $DESKFILE $RSSTARTUP $@
+    elif [ -x "$KDESUDO" ]; then
+        $KDESUDO $RSSTARTUP --- "$envi" $@
+    elif [ -x "$PKEXEC" ]; then
+        $PKEXEC $RSSTARTUP --- "$envi" $@
+    else
+        $TRAMPLIN $@ > /dev/null 2>&1
+    fi
+
+fi