package another-redis-desktop-manager-1.6.0

6 files changed, 58 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 493ec9f0f33b..30009288ebcc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,15 @@
 pkgbase = another-redis-desktop-manager
-	pkgdesc = Another Redis Desktop Manager
-	pkgver = 1.2.4
+	pkgdesc = A faster, better and more stable redis desktop manager, compatible with Linux, windows, mac. What's more, it won't crash when loading massive keys.
+	pkgver = 1.6.0
 	pkgrel = 1
 	url = https://github.com/qishibo/AnotherRedisDesktopManager
-	arch = x86_64
+	arch = any
 	license = MIT
-	depends = libappindicator-sharp
-	depends = libappindicator-gtk3
-	depends = libappindicator-gtk2
-	depends = gconf
-	depends = libindicator-gtk3
-	depends = libindicator-gtk2
-	depends = libnotify
-	depends = libxss
-	depends = libxtst
-	source = https://github.com/qishibo/AnotherRedisDesktopManager/releases/download/v1.2.4/Another.Redis.Desktop.Manager.1.2.4.AppImage
-	source = another-redis-desktop-manager.desktop
-	source = another-redis-desktop-manager.png
-	source = LICENSE
-	md5sums = 9818915d396b59af1037b17fd1c3460f
-	md5sums = 11ac6e7e9d578a9ad0b548c3fc9a2527
-	md5sums = 3f7c15e66be6ffd8b70fbb50882fc0dd
-	md5sums = 74fd786ee05276f7550f94e8ed1bf495
+	provides = another-redis-desktop-manager
+	provides = another-redis-desktop-manager.Appimage
+	conflicts = another-redis-desktop-manager
+	conflicts = another-redis-desktop-manager-Appimage
+	source = another-redis-desktop-manager.AppImage::https://github.com/qishibo/AnotherRedisDesktopManager/releases/download/v1.6.0/Another-Redis-Desktop-Manager.1.6.0.AppImage
+	md5sums = c3c88c5c9fffae3af497ef657c425bb6
 
 pkgname = another-redis-desktop-manager
-
diff --git a/.gitignore b/.gitignore
index 70f090a44295..8ebfacab0c9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
-src
-pkg
-*.part.*
-*.deb
-*.rpm
-*.AppImage
-*.pkg.tar.xz
-
+*
+!.SRCINFO
+!PKGBUILD
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index e6210fb65459..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) qii404.me
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 3e58a8b5cb49..f31bab5b7b2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,53 @@
-# Maintainer: Shane Lyx <shanelyx at outlook dot com>
 pkgname=another-redis-desktop-manager
-pkgver=1.2.4
+pkgver=1.6.0
 pkgrel=1
-pkgdesc="Another Redis Desktop Manager"
-arch=("x86_64")
+pkgdesc="A faster, better and more stable redis desktop manager, compatible with Linux, windows, mac. What's more, it won't crash when loading massive keys." # 包描述
+arch=('any')
 url="https://github.com/qishibo/AnotherRedisDesktopManager"
-license=('MIT')
-depends=('libappindicator-sharp' 'libappindicator-gtk3' 'libappindicator-gtk2' 'gconf' 'libindicator-gtk3' 'libindicator-gtk2'
-    'libnotify' 'libxss' 'libxtst')
-
-source=(
-    "https://github.com/qishibo/AnotherRedisDesktopManager/releases/download/v1.2.4/Another.Redis.Desktop.Manager.1.2.4.AppImage"
-    "another-redis-desktop-manager.desktop"
-    "another-redis-desktop-manager.png"
-	"LICENSE"
-)
-
-md5sums=('9818915d396b59af1037b17fd1c3460f'
-         '11ac6e7e9d578a9ad0b548c3fc9a2527'
-         '3f7c15e66be6ffd8b70fbb50882fc0dd'
-         '74fd786ee05276f7550f94e8ed1bf495')
-
-package(){
-    cd ${srcdir}
-    7z x Another.Redis.Desktop.Manager.1.2.4.AppImage -o"${pkgdir}/opt/Another.Redis.Desktop.Manager"
-    chmod  -R 755 "${pkgdir}/opt"
-
-    # desktop
-    mkdir  -p  ${pkgdir}/usr/share/applications
-    install  -Dm644  another-redis-desktop-manager.desktop  ${pkgdir}/usr/share/applications/
-    
-    # icon
-    mkdir  -p  ${pkgdir}/usr/share/icons/hicolor/512x512/apps
-    install  -Dm644  another-redis-desktop-manager.png  ${pkgdir}/usr/share/icons/hicolor/512x512/apps/
-	
-	#license
-	mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-	install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/
+license=('MIT') 
+provides=('another-redis-desktop-manager' 'another-redis-desktop-manager.Appimage')
+conflicts=('another-redis-desktop-manager' 'another-redis-desktop-manager-Appimage')
+image="${pkgname}.AppImage"
+source=("${image}::${url}/releases/download/v${pkgver}/Another-Redis-Desktop-Manager.${pkgver}.AppImage") #源码
+md5sums=('c3c88c5c9fffae3af497ef657c425bb6')
+options=(!strip)
+
+
+prepare() {
+    chmod +x "${image}"
+    ./"${image}" --appimage-extract
+}
+
+build() {
+    # Adjust .desktop so it will work outside of AppImage container
+    sed -i \
+        -e "s|Exec=AppRun|Exec=env DESKTOPINTEGRATION=false /usr/bin/${pkgname}|" \
+        -e "s|Icon=.*|Icon=/usr/share/icons/${pkgname}.png|" \
+        "squashfs-root/${pkgname}.desktop"
+
+    # Fix permissions; .AppImage permissions are 700 for all directories
+    chmod -R a-x+rX squashfs-root/usr
 }
 
 
+package() {
+    # AppImage
+    install -Dm755 "${srcdir}/${image}" "${pkgdir}/opt/${pkgname}/${image}"
+    install -Dm644 "${srcdir}/squashfs-root/LICENSE.electron.txt" "${pkgdir}/opt/${pkgname}/LICENSE"
 
+    # Desktop file
+    install -Dm644 "${srcdir}/squashfs-root/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+    # Icon images
+    install -dm755 "${pkgdir}/usr/share/"
+    cp -a "${srcdir}/squashfs-root/usr/share/icons" "${pkgdir}/usr/share/"
+    ln -s "$(realpath ${srcdir}/squashfs-root/${pkgname}.png  --relative-to ${srcdir}/squashfs-root/usr/share/icons)" "${pkgdir}/usr/share/icons/${pkgname}.png"
+
+    # Symlink executable
+    install -dm755 "${pkgdir}/usr/bin"
+    ln -s "/opt/${pkgname}/${pkgname}.AppImage" "${pkgdir}/usr/bin/${pkgname}"
+
+    # Symlink license
+    install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}/"
+    ln -s "/opt/${pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}"
+}
diff --git a/another-redis-desktop-manager.desktop b/another-redis-desktop-manager.desktop
deleted file mode 100644
index 7cfa5fce3e9b..000000000000
--- a/another-redis-desktop-manager.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Categories=Development;Utility;
-Comment=A faster, better and more stable redis desktop manager.
-Exec=/opt/Another.Redis.Desktop.Manager/AppRun
-Icon=another-redis-desktop-manager
-Name=Another-Redis-Desktop-Manager
-StartupWMClass=Another.Redis.Desktop.Manager
-Terminal=false
-Type=Application
-X-AppImage-BuildId=1NiitrlhpN0PQdDacKLp9dWtu3U
-X-AppImage-Version=1.2.4
-X-Deepin-Vendor=user-custom
diff --git a/another-redis-desktop-manager.png b/another-redis-desktop-manager.png
deleted file mode 100644
index d9c696992b38..000000000000
--- a/another-redis-desktop-manager.png
+++ /dev/null