From e434fd824420d88d9a7458a4fbd07f38f3cc72ef Mon Sep 17 00:00:00 2001
From: Michel Le Cocq <lecocq@ipgp.fr>
Date: Tue, 4 Mar 2025 09:36:00 +0100
Subject: [PATCH 1/2] add : apt full-upgrade

apt full-upgrade : debut d'integration mais encore un peu brouillon

suppression des commentaires inutiles
---
 upsnapz.sh | 99 +++++++++++++++++++++++++-----------------------------
 1 file changed, 45 insertions(+), 54 deletions(-)

diff --git a/upsnapz.sh b/upsnapz.sh
index d03629d..31b8c42 100755
--- a/upsnapz.sh
+++ b/upsnapz.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Time-stamp: <2025-03-03 06:37:28 nomad>
+# Time-stamp: <2025-03-04 09:35:37 nomad>
 
 # Michel Le Cocq <lecocq@ipgp.fr>
 #                <nomad@neuronfarm.net>
@@ -26,38 +26,12 @@
 # +------------------------------------------------------------------------------------------------+
 #   To do or not :
 #
-# - ajouter zpool upgrade or not
-# - ajouter question cleanup zroot
+# - ajouter question cleanup zroot snapshot
 # - regarder si un nouveau kernel existe et si oui faire ce qu'il y a a faire
 # - verifier que les noms des zroot/ROOT/vol sont conformes au format attendu
-# - verfier que 'gh auth status' fonctionne avant de l'utiliser (auth)
-#
-# - souci dans clone promote oui non !?
-#   je fais dans la fonction askpromote
-# 	sudo zfs clone $bootfs@$snapname $parents/$sugsname
-#	sudo zfs promote $parents/$sugsname
-#   je fais ca pour que : promote clone dataset no longer depend on origin snapshot
-#
-#   je pense finalement que je fais la meme chose que ZBM a veririfer
-# 
-# - integrer apt dist-upgrade
-#   
-# root@nsob:~# apt dist-upgrade
-# Upgrading:                      
-#   libnvpair3linux  libuutil3linux  zfs-dkms  zfs-initramfs  zfs-zed  zfsutils-linux
-# 
-# Installing dependencies:
-#   libzfs6linux  libzpool6linux
-# 
-# REMOVING:
-#   libzfs4linux  libzpool5linux
-# 
-# Summary:
-#   Upgrading: 6, Installing: 2, Removing: 2, Not Upgrading: 0
-#   Download size: 4891 kB
-#   Space needed: 538 kB / 27.3 GB available
-#
-# proposition pour checker, il faut relancer : 	apt list --upgradable : et regarder
+# - verfier que 'gh auth status' fonctionne avant de l'utiliser (auth) 
+# - ameliorer l'integration de : apt full-upgrade
+#   la c'est un peu brouillon
 #
 # +------------------------------------------------------------------------------------------------+
 
@@ -310,39 +284,56 @@ function snapchange
 
 function askupgrade()
 {
-    # run apt update
     # if there were upgrade ask for upgrade or not
     #    ask for making a snapshot
     #    run apt upgrade
     # else 
     #    ask for making a snapshot
     
-    printf '%s\n' 'apt update'
+    printf '\n%s\n' 'apt list --upgradable'
+    apt list --upgradable
+    
+    printf '\nUpgrade or not : [Y-n]'
+    read answer
+    
+    if [ -z $answer ]
+    then
+	echo y
+	answer='y'
+    fi
+
+    if [[ "$answer" == "y" ]]
+    then
+	printf 'before upgrade : '	    
+	asksnap
+	printf '%s\n' 'apt -y upgrade'
+	if [ $1 -eq 1 ]
+	then
+	    echo '\nAbove packages need full upgrade.\nRun full-upgrade :'
+	    sudo apt -y full-upgrade	    	    
+	elif [ $1 -eq 0 ]
+	then
+	    sudo apt -y upgrade	    
+	fi
+    else
+	echo no	    
+    fi
+}
+
+function checkupgrade()
+{
+    # run apt update
+    
+    printf '%s\n' 'apt update'    
     sudo apt update
     if [ $(apt list --upgradable 2>/dev/null | wc -l) -gt 1 ]
     then
-	printf '\n%s\n' 'apt list --upgradable'
-	apt list --upgradable
-	
-	printf '\nUpgrade or not : [Y-n]'
-	read answer
-    
-	if [ -z $answer ]
+	askupgrade 0
+	sudo apt update 2>/dev/null
+	if [ $(apt list --upgradable 2>/dev/null | wc -l) -gt 1 ]
 	then
-	    echo y
-	    answer='y'
+	    askupgrade 1
 	fi
-
-	if [[ "$answer" == "y" ]]
-	then
-	    printf 'before upgrade : '	    
-	    asksnap
-	    printf '%s\n' 'apt -y upgrade'	
-	    sudo apt -y upgrade	        
-	else
-	    echo no	    
-	fi
-    else
 	echo
 	asksnap	
     fi
@@ -378,7 +369,7 @@ while getopts 'hbs' OPTION; do
  esac    
 done
 
-askupgrade
+checkupgrade
 askautoclean
 snapchange
 echo

From 495080c52ed2ebffd5e4bd03121ee8c92bc7ae6f Mon Sep 17 00:00:00 2001
From: Michel Le Cocq <lecocq@ipgp.fr>
Date: Wed, 5 Mar 2025 07:55:10 +0100
Subject: [PATCH 2/2] deplacement test

---
 upsnapz.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/upsnapz.sh b/upsnapz.sh
index 31b8c42..9835888 100755
--- a/upsnapz.sh
+++ b/upsnapz.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Time-stamp: <2025-03-04 09:35:37 nomad>
+# Time-stamp: <2025-03-05 07:54:37 nomad>
 
 # Michel Le Cocq <lecocq@ipgp.fr>
 #                <nomad@neuronfarm.net>
@@ -304,15 +304,15 @@ function askupgrade()
 
     if [[ "$answer" == "y" ]]
     then
-	printf 'before upgrade : '	    
-	asksnap
-	printf '%s\n' 'apt -y upgrade'
 	if [ $1 -eq 1 ]
 	then
 	    echo '\nAbove packages need full upgrade.\nRun full-upgrade :'
 	    sudo apt -y full-upgrade	    	    
 	elif [ $1 -eq 0 ]
 	then
+	    printf 'before upgrade : '	    
+	    asksnap
+	    printf '%s\n' 'apt -y upgrade'	    
 	    sudo apt -y upgrade	    
 	fi
     else