4.0.1

3 files changed, 71 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1bb5471d98fe..c166366ee8cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,27 @@
 pkgbase = slimbookbattery
-	pkgdesc = A battery optimization application for portable devices
-	pkgver = 3.97beta
-	pkgrel = 4
+	pkgdesc = Battery optimization application for portable devices.
+	pkgver = 4.0.1
+	pkgrel = 1
 	url = https://slimbook.es
 	install = slimbookbattery.install
 	arch = x86_64
-	license = CC BY-NC-ND 3.0
-	depends = python-gobject
-	depends = python-cairo
-	depends = python-pillow
-	depends = python-dbus
-	depends = libappindicator-gtk3
-	depends = libnotify
-	depends = tlp-rdw
+	license = GPL3
 	depends = cron
 	depends = dmidecode
+	depends = gtk3
+	depends = libnotify
+	depends = python-dbus
+	depends = python-cairo
+	depends = python-gobject
+	depends = python-pillow
+	depends = tlp<=1.3.1
+	depends = tlp-rdw<=1.3.1
 	depends = xorg-xdpyinfo
 	optdepends = nvidia-prime: for hybrid graphics switching
-	optdepends = gnome-shell-extension-appindicator: for tray icon on GNOME
-	source = https://launchpad.net/~slimbook/+archive/ubuntu/slimbook/+files/slimbookbattery_3.97beta_all.deb
-	sha256sums = 8eda64d2207b01a8dd1f89b8234711c5ceeda516e0ead1de5dae1e5cb709bf13
+	optdepends = libappindicator-gtk3: tray icon
+	optdepends = slimbookamdcontroller: Synchronize battery mode with CPU TDP mode
+	optdepends = slimbootkintelcontroller: Synchronize battery mode with CPU TDP mode
+	source = https://launchpad.net/~slimbook/+archive/ubuntu/slimbook/+files/slimbookbattery_4.0.1_all.deb
+	sha256sums = d7493c65109df43becd0900eeb7293f579626f4a3b31bffe6f6c6463652f4c74
 
 pkgname = slimbookbattery
-
diff --git a/PKGBUILD b/PKGBUILD
index 82a0209395dd..2f47eadba4b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,40 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 # Contributor: tioguda <guda.flavio@gmail.com>
 pkgname=slimbookbattery
-pkgver=3.97beta
-pkgrel=4
-pkgdesc="A battery optimization application for portable devices"
+pkgver=4.0.1
+pkgrel=1
+pkgdesc="Battery optimization application for portable devices."
 arch=('x86_64')
 url="https://slimbook.es"
-license=('CC BY-NC-ND 3.0')
-depends=('python-gobject' 'python-cairo' 'python-pillow' 'python-dbus'
-         'libappindicator-gtk3' 'libnotify' 'tlp-rdw' 'cron' 'dmidecode'
-         'xorg-xdpyinfo')
+license=('GPL3')
+depends=('cron' 'dmidecode' 'gtk3' 'libnotify' 'python-dbus' 'python-cairo'
+         'python-gobject' 'python-pillow' 'tlp<=1.3.1' 'tlp-rdw<=1.3.1' 'xorg-xdpyinfo')
 optdepends=('nvidia-prime: for hybrid graphics switching'
-            'gnome-shell-extension-appindicator: for tray icon on GNOME')
+            'libappindicator-gtk3: tray icon'
+            'slimbookamdcontroller: Synchronize battery mode with CPU TDP mode'
+            'slimbootkintelcontroller: Synchronize battery mode with CPU TDP mode')
 install="$pkgname.install"
 source=("https://launchpad.net/~slimbook/+archive/ubuntu/slimbook/+files/${pkgname}_${pkgver}_all.deb")
-sha256sums=('8eda64d2207b01a8dd1f89b8234711c5ceeda516e0ead1de5dae1e5cb709bf13')
+sha256sums=('d7493c65109df43becd0900eeb7293f579626f4a3b31bffe6f6c6463652f4c74')
 
 package() {
-    bsdtar xf data.tar.xz -C "$pkgdir"
+  bsdtar xf data.tar.xz -C "$pkgdir"
 
-    install -d "$pkgdir/usr/lib/systemd/system"
-    mv "$pkgdir/etc/systemd/system/suspend-sedation.service" \
-    	"$pkgdir/usr/lib/systemd/system"
-    rm -rf "$pkgdir/etc/systemd"
+  # Symlink service
+  install -d "$pkgdir/usr/lib/systemd/system"
+  ln -s "/usr/share/$pkgname/src/service/$pkgname.service" \
+    "$pkgdir/usr/lib/systemd/system"
 
-    install -d "$pkgdir/usr/share/licenses/$pkgname"
-    mv "$pkgdir/usr/share/doc/$pkgname/copyright" \
-    	"$pkgdir/usr/share/licenses/$pkgname"
+  # Remove duplicate GPL3 license & changelog.gz
+  rm -rf "$pkgdir/usr/share/doc"
+
+  # Install locales
+  cd "$pkgdir/usr/share/$pkgname/src/locale"
+  for lang in $(ls -d */); do
+    install -d "$pkgdir/usr/share/locale/${lang}LC_MESSAGES"
+    mv "$pkgdir/usr/share/$pkgname/src/locale/${lang}LC_MESSAGES"/*.mo \
+      "$pkgdir/usr/share/locale/${lang}LC_MESSAGES"
+  done
+  rm -rf "$pkgdir/usr/share/$pkgname/src/locale"
+  rm "$pkgdir/usr/share/$pkgname/src/update_po.sh"
 }
diff --git a/slimbookbattery.install b/slimbookbattery.install
index 681ba5a05044..be3eb6b84577 100644
--- a/slimbookbattery.install
+++ b/slimbookbattery.install
@@ -1,29 +1,37 @@
 post_install() {
-    python3 -OO -m py_compile /usr/share/slimbookbattery/preferences.py
-    python3 -OO -m py_compile /usr/share/slimbookbattery/slimbookbattery
-    python3 -OO -m py_compile /usr/share/slimbookbattery/slimbookbattery-changemode.py
-    python3 -OO -m py_compile /usr/share/slimbookbattery/slimbookbattery-report.py
+  if python /usr/share/slimbookbattery/src/check_config.py; then
+    echo 'Configuration OK'
+  fi
 
-    rm /usr/share/slimbookbattery/preferences.py
-    rm /usr/share/slimbookbattery/slimbookbattery
-    rm /usr/share/slimbookbattery/slimbookbattery-changemode.py
-    rm /usr/share/slimbookbattery/slimbookbattery-report.py
+  if chmod -R 766 /home/*/.config/slimbookbattery; then
+    echo 'Read/Write permissions given to config files.'
+  fi
 
-    cp /usr/share/slimbookbattery/__pycache__/preferences.cpython-*.pyc /usr/share/slimbookbattery/preferences.pyc
-    cp /usr/share/slimbookbattery/__pycache__/slimbookbatterycpython-*.pyc /usr/share/slimbookbattery/slimbookbattery
-    cp /usr/share/slimbookbattery/__pycache__/slimbookbattery-changemode.cpython-*.pyc /usr/share/slimbookbattery/slimbookbattery-changemode.pyc
-    cp /usr/share/slimbookbattery/__pycache__/slimbookbattery-report.cpython-*.pyc /usr/share/slimbookbattery/slimbookbattery-report.pyc
+  if chmod -R 755 /usr/share/slimbookbattery/src/*.sh; then
+    echo 'Exec permissions given.'
+  fi
 
-    rm /usr/share/slimbookbattery/__pycache__/*
-    rmdir /usr/share/slimbookbattery/__pycache__
+  if chmod -R 755 /usr/share/slimbookbattery/src/*.py; then
+    echo 'Exec permissions given to src.'
+  fi
 
-    chmod +x /usr/share/slimbookbattery/bin/*
+  # Enabling tlp.service
+  if sudo systemctl enable tlp.service; then
+    echo 'Tlp service enabled'
+  fi
+
+  echo 'Checking users autostart files'
+  for user in $(ls /home); do
+    echo
+    echo $user
+
+    if test -f /home/$user/.config/autostart/slimbookbattery-autostart.desktop; then
+      echo "Restoring /home/$user/.config/autostart/slimbookbattery-autostart.desktop"
+      cp /usr/share/slimbookbattery/src/slimbookbattery-autostart.desktop /home/$user/.config/autostart/slimbookbattery-autostart.desktop
+    fi
+  done
 }
 
 post_upgrade() {
     post_install
 }
-
-post_remove() {
-    rm -rf /usr/share/slimbookbattery
-}