Release v1.4

3 files changed, 27 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72f00b61e701..d343070d1687 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = optimus-manager
 	pkgdesc = Management utility to handle GPU switching for Optimus laptops
-	pkgver = 1.3.1
+	pkgver = 1.4
 	pkgrel = 1
 	url = https://github.com/Askannz/optimus-manager
 	arch = any
@@ -15,17 +15,20 @@ pkgbase = optimus-manager
 	optdepends = bbswitch: alternative power switching method
 	optdepends = acpi_call: alternative power switching method
 	optdepends = xf86-video-intel: provides the Xorg intel driver
-	provides = optimus-manager=1.3.1
+	provides = optimus-manager=1.4
 	conflicts = optimus-manager-git
-	backup = etc/optimus-manager/xorg-intel.conf
-	backup = etc/optimus-manager/xorg-nvidia.conf
-	backup = etc/optimus-manager/xsetup-intel.sh
+	backup = etc/optimus-manager/xorg/integrated-mode/integrated-gpu.conf
+	backup = etc/optimus-manager/xorg/nvidia-mode/integrated-gpu.conf
+	backup = etc/optimus-manager/xorg/nvidia-mode/nvidia-gpu.conf
+	backup = etc/optimus-manager/xorg/hybrid-mode/integrated-gpu.conf
+	backup = etc/optimus-manager/xorg/hybrid-mode/nvidia-gpu.conf
+	backup = etc/optimus-manager/xsetup-integrated.sh
 	backup = etc/optimus-manager/xsetup-nvidia.sh
 	backup = etc/optimus-manager/xsetup-hybrid.sh
 	backup = etc/optimus-manager/nvidia-enable.sh
 	backup = etc/optimus-manager/nvidia-disable.sh
 	backup = var/lib/optimus-manager/persistent/startup_mode
-	source = git+https://github.com/Askannz/optimus-manager.git#tag=v1.3.1
+	source = git+https://github.com/Askannz/optimus-manager.git#tag=v1.4
 	sha256sums = SKIP
 
 pkgname = optimus-manager
diff --git a/PKGBUILD b/PKGBUILD
index e81700639c9c..e95feb4df1ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Robin Lange <robin dot langenc at gmail dot com>
-# Contributor: Robin Lange <robin dot langenc at gmail dot com>
+
 pkgname=optimus-manager
-pkgver=1.3.1
+pkgver=1.4
 pkgrel=1
 pkgdesc="Management utility to handle GPU switching for Optimus laptops"
 arch=('any')
@@ -14,10 +14,13 @@ optdepends=('bbswitch: alternative power switching method'
             'acpi_call: alternative power switching method'
             'xf86-video-intel: provides the Xorg intel driver')
 makedepends=('python-setuptools' 'git')
-backup=('etc/optimus-manager/xorg-intel.conf'
-        'etc/optimus-manager/xorg-nvidia.conf'
+backup=('etc/optimus-manager/xorg/integrated-mode/integrated-gpu.conf'
+        'etc/optimus-manager/xorg/nvidia-mode/integrated-gpu.conf'
+        'etc/optimus-manager/xorg/nvidia-mode/nvidia-gpu.conf'
+        'etc/optimus-manager/xorg/hybrid-mode/integrated-gpu.conf'
+        'etc/optimus-manager/xorg/hybrid-mode/nvidia-gpu.conf'
 
-        'etc/optimus-manager/xsetup-intel.sh'
+        'etc/optimus-manager/xsetup-integrated.sh'
         'etc/optimus-manager/xsetup-nvidia.sh'
         'etc/optimus-manager/xsetup-hybrid.sh'
 
@@ -31,7 +34,7 @@ sha256sums=('SKIP')
 build() {
  
   cd "${srcdir}/optimus-manager/"
-  python3 setup.py build
+  /usr/bin/python3 setup.py build
  
 }
  
@@ -48,20 +51,26 @@ package() {
   install -Dm644 optimus-manager.conf "$pkgdir/usr/share/optimus-manager.conf"
   
   install -Dm644 systemd/logind/10-optimus-manager.conf "$pkgdir/usr/lib/systemd/logind.conf.d/10-optimus-manager.conf"
+  install -Dm755 systemd/suspend/optimus-manager.py "$pkgdir/usr/lib/systemd/system-sleep/optimus-manager.py"
+  
   
   install -Dm644 login_managers/sddm/20-optimus-manager.conf "$pkgdir/etc/sddm.conf.d/20-optimus-manager.conf"
   install -Dm644 login_managers/lightdm/20-optimus-manager.conf  "$pkgdir/etc/lightdm/lightdm.conf.d/20-optimus-manager.conf"
   
-  install -Dm644 config/xorg-intel.conf "$pkgdir/etc/optimus-manager/xorg-intel.conf"
-  install -Dm644 config/xorg-nvidia.conf "$pkgdir/etc/optimus-manager/xorg-nvidia.conf"
+  install -Dm644 config/xorg/integrated-mode/integrated-gpu.conf "$pkgdir/etc/optimus-manager/xorg/integrated-mode/integrated-gpu.conf"
+  install -Dm644 config/xorg/nvidia-mode/nvidia-gpu.conf "$pkgdir/etc/optimus-manager/xorg/nvidia-mode/nvidia-gpu.conf"
+  install -Dm644 config/xorg/nvidia-mode/integrated-gpu.conf "$pkgdir/etc/optimus-manager/xorg/nvidia-mode/integrated-gpu.conf"
+  install -Dm644 config/xorg/hybrid-mode/integrated-gpu.conf "$pkgdir/etc/optimus-manager/xorg/hybrid-mode/integrated-gpu.conf"
+  install -Dm644 config/xorg/hybrid-mode/nvidia-gpu.conf "$pkgdir/etc/optimus-manager/xorg/hybrid-mode/nvidia-gpu.conf"
   
   install -Dm755 config/xsetup-intel.sh "$pkgdir/etc/optimus-manager/xsetup-intel.sh"
   install -Dm755 config/xsetup-nvidia.sh "$pkgdir/etc/optimus-manager/xsetup-nvidia.sh"
   install -Dm755 config/xsetup-hybrid.sh "$pkgdir/etc/optimus-manager/xsetup-hybrid.sh"
+  install -Dm755 config/xsetup-integrated.sh "$pkgdir/etc/optimus-manager/xsetup-integrated.sh"
 
   install -Dm755 config/nvidia-enable.sh "$pkgdir/etc/optimus-manager/nvidia-enable.sh"
   install -Dm755 config/nvidia-disable.sh "$pkgdir/etc/optimus-manager/nvidia-disable.sh"
  
-  python3 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+  /usr/bin/python3 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
  
 } 
diff --git a/optimus-manager.install b/optimus-manager.install
index a343b10b6be1..4339c45fb02f 100644
--- a/optimus-manager.install
+++ b/optimus-manager.install
@@ -1,52 +1,4 @@
-cleanup() {
 
-    echo "optimus-manager : removing obsolete auto-generated files left over by previous versions"
-    
-    # SDDM
-    sddm_conf=/etc/sddm.conf.d/10-optimus-manager.conf
-    if [ -f "$sddm_conf" ]; then
-        rm $sddm_conf
-    fi
-    
-    sddm_xsetup=/usr/share/sddm/scripts/Xsetup
-    if [ -f "$sddm_conf" ]; then
-        printf "#!/bin/sh\n# Xsetup - run as root before the login dialog appears\n" > "$sddm_xsetup"
-        chmod 755 "$sddm_xsetup"
-    fi
-
-    # LightDM
-    lightdm_conf=/etc/lightdm/lightdm.conf.d/10-optimus-manager.conf
-    if [ -f "$lightdm_conf" ]; then
-        rm $lightdm_conf
-    fi
-
-    # GDM
-    gdm_file_1=/usr/share/gdm/greeter/autostart/optimus-manager-xsetup.desktop
-    if [ -f "$gdm_file_1" ]; then
-        rm $gdm_file_1
-    fi
-
-    gdm_file_2=/etc/xdg/autostart/optimus-manager-xsetup.desktop
-    if [ -f "$gdm_file_2" ]; then
-        rm $gdm_file_2
-    fi
-
-    # Xorg
-    xorg_conf=/etc/X11/xorg.conf.d/10-optimus-manager.conf
-    if [ -f "$xorg_conf" ]; then
-        rm $xorg_conf
-    fi
-}
-
-make_log_folder() {
-    LOGDIR=/var/log/optimus-manager/
-    mkdir -p "$LOGDIR"
-    chmod 777 "$LOGDIR"
-}
-
-pre_install() {
-    cleanup
-}
 
 post_install() {
 
@@ -54,28 +6,10 @@ post_install() {
     mkdir -p /etc/systemd/system/graphical.target.wants/
     ln -s /usr/lib/systemd/system/optimus-manager.service /etc/systemd/system/graphical.target.wants/optimus-manager.service
     
-    make_log_folder
-    
     bold=$(tput bold)
     red=$(tput setaf 1)
     normal=$(tput sgr0)
     echo "${bold}${red}Please reboot your computer before using optimus-manager${normal}"
-
-}
-
-pre_upgrade() {
-    cleanup
-    
-}
-
-post_upgrade() {
-
-    make_log_folder
-    
-    bold=$(tput bold)
-    red=$(tput setaf 1)
-    normal=$(tput sgr0)
-    echo "${bold}${red}optimus-manager : warning : power management is disabled by default since v1.2. See https://github.com/Askannz/optimus-manager/wiki/A-guide--to-power-management-options${normal}"
 }
 
 post_remove() {