diff --git a/PKGBUILD b/PKGBUILD
index d3d9765..906dbab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=systrayupdater
pkgver=r36.ba00462
pkgrel=1
-pkgdesc="PyQt5 system tray applet to notify of available updates"
+pkgdesc="PyQt5 system tray applet notifier of available updates"
arch=('x86_64')
url="https://github.com/ericlay/$pkgname"
license=('GPL3')
@@ -23,7 +23,8 @@ pkgver(){
package() {
cd "$srcdir/$pkgname"
- install -Dm755 systrayUpdater -t "$pkgdir/usr/bin"
- install -Dm666 SysTrayUpdater.desktop -t "$pkgdir/usr/share/applications"
- install -Dm755 ./*.png systrayupdater.yml -t "$pkgdir/$HOME/.config/$pkgname"
+ install -Dm755 systrayupdater -t "$pkgdir/usr/bin"
+ install -Dm755 config.yml -t "$pkgdir/etc/$pkgname"
+ install -Dm666 systrayupdater.desktop -t "$pkgdir/usr/share/applications"
+ install -Dm644 ./*.svg -t "$pkgdir/usr/share/icons/hicolor/symbolic/apps"
}
diff --git a/arch-blue-symbolic-24.svg b/arch-blue-symbolic-24.svg
new file mode 100644
index 0000000..08c5e70
--- /dev/null
+++ b/arch-blue-symbolic-24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/arch-blue-symbolic-80.svg b/arch-blue-symbolic-80.svg
new file mode 100644
index 0000000..1319c89
--- /dev/null
+++ b/arch-blue-symbolic-80.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/arch-white-symbolic-24.svg b/arch-white-symbolic-24.svg
new file mode 100644
index 0000000..8b00be0
--- /dev/null
+++ b/arch-white-symbolic-24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/blue-logo.png b/blue-logo.png
deleted file mode 100644
index 1cf40d5..0000000
Binary files a/blue-logo.png and /dev/null differ
diff --git a/systrayupdater.yml b/config.yml
similarity index 89%
rename from systrayupdater.yml
rename to config.yml
index 52d76a2..99d9289 100644
--- a/systrayupdater.yml
+++ b/config.yml
@@ -9,4 +9,4 @@ option: -e
timer: 10
# custom icons should follow Arch linux standards
# custom icons should be stored in ~/.config/systrayUpdater
-icon: white-logo.png
+icon: arch-white-symbolic-24.svg
diff --git a/systrayUpdater b/systrayupdater
similarity index 89%
rename from systrayUpdater
rename to systrayupdater
index 038f3f9..9dbca3c 100755
--- a/systrayUpdater
+++ b/systrayupdater
@@ -17,12 +17,17 @@ outputList = ""
# Use config.yml file to allow for compatibility with
# most terminal emulators possible & custom icon / timer duration
-with open(path.expanduser("~/.config/systrayupdater/systrayupdater.yml")) as f:
+if path.exists(path.expanduser("~/.config/systrayupdater/config.yml")):
+ config = path.expanduser("~/.config/systrayupdater/config.yml")
+else:
+ config = '/etc/systrayupdater/config.yml'
+
+with open(config) as f:
conf = yaml.load(f, yaml.FullLoader)
term = str(conf['terminal'])
opt = str(conf['option'])
wait = int(conf['timer']) * 60000
- icn = path.join(path.expanduser("~/.config/systrayupdater/"), str(conf['icon']))
+ icn = path.join('/usr/share/icons/hicolor/symbolic/apps/', str(conf['icon']))
f.close()
# Run checkupdates command
diff --git a/SysTrayUpdater.desktop b/systrayupdater.desktop
similarity index 69%
rename from SysTrayUpdater.desktop
rename to systrayupdater.desktop
index 8952879..0b597b9 100644
--- a/SysTrayUpdater.desktop
+++ b/systrayupdater.desktop
@@ -3,7 +3,7 @@ Version=1.0
Type=Application
Name=SysTrayUpdater
Exec=/usr/bin/systrayUpdater
-Icon=$HOME/.config/systrayUpdater/blue-logo.png
+Icon=/usr/share/icons/hicolor/symbolic/arch-blue-symbolic-80.svg
Terminal=false
StartupNotify=false
Categories=Utility;
diff --git a/white-logo.png b/white-logo.png
deleted file mode 100644
index ea95410..0000000
Binary files a/white-logo.png and /dev/null differ