From c04e753bb9aec396a37b5a0acc42d268aa01c0d7 Mon Sep 17 00:00:00 2001
From: Frank Schiebel <codeberg@ua25.de>
Date: Tue, 25 Mar 2025 10:57:12 +0100
Subject: [PATCH] Bluej v542, Arduino IDE 2 testing

---
 qgm-updatecache.yml                           |  7 +++--
 roles/lmn_kde/tasks/main.yml                  |  1 +
 .../files/qg.appimage.ArduinoIDE2.desktop     |  2 +-
 .../files/start-arduino2-appimage             | 16 +++++++++++
 roles/lmn_qgsoftware/tasks/install.yml        | 27 +++++++++++++++++++
 roles/qgm_updatecache/tasks/download.yml      |  2 +-
 vars-qgsoftware.yml                           |  2 +-
 7 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100755 roles/lmn_qgsoftware/files/start-arduino2-appimage

diff --git a/qgm-updatecache.yml b/qgm-updatecache.yml
index bf36d79..c1ac128 100644
--- a/qgm-updatecache.yml
+++ b/qgm-updatecache.yml
@@ -1,8 +1,11 @@
 ## This playbook deploys a KDE desktop machine for LinuxMuster.
+#  hosts: localhost
+#  remote_user: ansible
+#  become: yes
 ---
 - name: Update local software cache on netboot Host
-  hosts: all
-  remote_user: ansible
+  hosts: localhost
+  connection: local
   become: yes
 
   vars_files:
diff --git a/roles/lmn_kde/tasks/main.yml b/roles/lmn_kde/tasks/main.yml
index 5623840..520b99e 100644
--- a/roles/lmn_kde/tasks/main.yml
+++ b/roles/lmn_kde/tasks/main.yml
@@ -23,6 +23,7 @@
       - task-german-kde-desktop
       - task-kde-desktop
       - thonny
+      - scdaemon
       - thunderbird-l10n-de
       - vlc
       - vym
diff --git a/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop b/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop
index e622a34..f498c8f 100644
--- a/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop
+++ b/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop
@@ -2,7 +2,7 @@
 Name=Arduino IDE2 AppImage
 Comment=Open-source electronics prototyping platform
 GenericName=Arduino IDE
-Exec=/opt/appimages/arduino2/ArduinoIDE2.AppImage %f
+Exec=unset -v https_proxy http_proxy && . /opt/appimages/arduino2/start-arduino2-appimage %f > /tmp/arduinoAppimage.log 2>&1
 Icon=arduino
 Type=Application
 Terminal=false
diff --git a/roles/lmn_qgsoftware/files/start-arduino2-appimage b/roles/lmn_qgsoftware/files/start-arduino2-appimage
new file mode 100755
index 0000000..8613c89
--- /dev/null
+++ b/roles/lmn_qgsoftware/files/start-arduino2-appimage
@@ -0,0 +1,16 @@
+echo "---------------------"
+cachedir=/var/cache/user/${KDE_SESSION_UID}/arduino15
+echo "Cachedir: $cachedir"
+echo "---------------------"
+template=/var/lib/arduino2/template
+arduinoAppimage=/opt/appimages/arduino2/ArduinoIDE2.AppImage
+
+mkdir -p $cachedir
+
+rsync -avr --delete $template/ $cachedir/ > /dev/null 2>&1
+rm -rf ${HOME}/.arduino15
+ln -s $cachedir ${HOME}/.arduino15
+
+$arduinoAppimage $1 &
+
+
diff --git a/roles/lmn_qgsoftware/tasks/install.yml b/roles/lmn_qgsoftware/tasks/install.yml
index 6b98900..d23f3e3 100644
--- a/roles/lmn_qgsoftware/tasks/install.yml
+++ b/roles/lmn_qgsoftware/tasks/install.yml
@@ -66,6 +66,15 @@
     group: root
     mode: '0755'
 
+- name: Make sure lib dir for template exists
+  ansible.builtin.file:
+    path: /var/lib/arduino2
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+    mode: '0755'
+
 - name: Download Arduino2 AppImage from Cache
   ansible.builtin.get_url:
     url: "{{ mirror_appimage }}/ArduinoIDE2.AppImage"
@@ -80,6 +89,24 @@
     owner: root
     group: root
 
+- name: Copy arduino Appimage start Script to target
+  copy: 
+    src: files/start-arduino2-appimage  
+    dest: /opt/appimages/arduino2/start-arduino2-appimage
+    mode: '0755'
+    owner: root
+    group: root
+
+- name: Delete arduino15 template
+  ansible.builtin.file:
+    state: absent
+    path: /var/lib/arduino2/template
+
+- name: Extract up to date arduino15 template to target
+  ansible.builtin.unarchive:
+    src: "{{ mirror_appimage }}/ArduinoIDE2-template.zip"
+    dest: /var/lib/arduino2/
+    remote_src: yes
 
 ########
 # Prusa Slicer AppImage
diff --git a/roles/qgm_updatecache/tasks/download.yml b/roles/qgm_updatecache/tasks/download.yml
index 9a639d2..df25b12 100644
--- a/roles/qgm_updatecache/tasks/download.yml
+++ b/roles/qgm_updatecache/tasks/download.yml
@@ -1,7 +1,7 @@
 ---
 - name: Create greenfoot/bluej version strings w/o points
   set_fact:
-    bluejVersion: "{{ bluej_target_version  | replace('.','') }}"
+    bluejVersion: "{{ bluej_target_version  | replace('.','.') }}"
     greenfootVersion: "{{ greenfoot_target_version  | replace('.','') }}"
 
 - name: Get download URIs
diff --git a/vars-qgsoftware.yml b/vars-qgsoftware.yml
index c425bf2..802e618 100644
--- a/vars-qgsoftware.yml
+++ b/vars-qgsoftware.yml
@@ -1,7 +1,7 @@
 #### Bluej/Greenfoot
 ## Bluej/Greenfoot Versionen
 ## Für Updates anpassen
-bluej_target_version: "5.4.1"
+bluej_target_version: "5.4.2"
 greenfoot_target_version: "3.9.0"
 ## --
 greenfoot_src_uri: https://www.greenfoot.org/download/files/Greenfoot-linux-x64-VERSION.deb