Update Bluej, Greenfoot. Arduino2 Appimage, Slicer Appimage

2024-12-17 10:39:12 +01:00 · 2024-12-17 10:39:12 +01:00 · 58fd458616
commit 58fd458616
parent 05a62f8582
11 changed files with 281 additions and 9 deletions
--- a/qgm-desktop.yml
+++ b/qgm-desktop.yml
@ -44,7 +44,7 @@

  roles:
    - lmn_network
-    - up2date_debian
+    #- up2date_debian
    - lmn_sssd
    - lmn_mount
    - lmn_kde
@ -55,6 +55,24 @@
    #- kerberize
  
  tasks:
+    - name: Remove debian packages for FreeCAD
+      apt:
+        name:
+          - freecad
+          - freecad-common
+          - freecad-python3
+          - libfreecad-python3-0.20 
+        autoremove: true
+        state: absent
+    
+    - name: Remove debian packages for PrusaSlicer
+      apt:
+        name:
+          - prusa-slicer
+          - slic3r-prusa
+        autoremove: true
+        state: absent
+      
    - name: Copy Server roots-pubkey to clients
      authorized_key:
        user: ansible
--- a/roles/lmn_kde/tasks/main.yml
+++ b/roles/lmn_kde/tasks/main.yml
@ -8,7 +8,6 @@
      - codeblocks
      - dia
      - flameshot
-      - freecad
      - ghex
      - gimp
      - inkscape
--- a/roles/lmn_qgm/files/firefox-esr.desktop
+++ b/roles/lmn_qgm/files/firefox-esr.desktop
@ -0,0 +1,104 @@
+[Desktop Entry]
+Name=Firefox ESR
+Name[bg]=Firefox ESR
+Name[ca]=Firefox ESR
+Name[cs]=Firefox ESR
+Name[el]=Firefox ESR
+Name[es]=Firefox ESR
+Name[fa]=Firefox ESR
+Name[fi]=Firefox ESR
+Name[fr]=Firefox ESR
+Name[hu]=Firefox ESR
+Name[it]=Firefox ESR
+Name[ja]=Firefox ESR
+Name[ko]=Firefox ESR
+Name[nb]=Firefox ESR
+Name[nl]=Firefox ESR
+Name[nn]=Firefox ESR
+Name[no]=Firefox ESR
+Name[pl]=Firefox ESR
+Name[pt]=Firefox ESR
+Name[pt_BR]=Firefox ESR
+Name[ru]=Firefox ESR
+Name[sk]=Firefox ESR
+Name[sv]=Firefox ESR
+Comment=Browse the World Wide Web
+Comment[bg]=Сърфиране в Мрежата
+Comment[ca]=Navegueu per el web
+Comment[cs]=Prohlížení stránek World Wide Webu
+Comment[de]=Im Internet surfen
+Comment[el]=Περιηγηθείτε στον παγκόσμιο ιστό
+Comment[es]=Navegue por la web
+Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
+Comment[fi]=Selaa Internetin WWW-sivuja
+Comment[fr]=Navigue sur Internet
+Comment[hu]=A világháló böngészése
+Comment[it]=Esplora il web
+Comment[ja]=ウェブを閲覧します
+Comment[ko]=웹을 돌아 다닙니다
+Comment[nb]=Surf på nettet
+Comment[nl]=Verken het internet
+Comment[nn]=Surf på nettet
+Comment[no]=Surf på nettet
+Comment[pl]=Przeglądanie stron WWW 
+Comment[pt]=Navegue na Internet
+Comment[pt_BR]=Navegue na Internet
+Comment[ru]=Обозреватель Всемирной Паутины
+Comment[sk]=Prehliadanie internetu
+Comment[sv]=Surfa på webben
+GenericName=Web Browser
+GenericName[bg]=Интернет браузър
+GenericName[ca]=Navegador web
+GenericName[cs]=Webový prohlížeč
+GenericName[de]=Webbrowser
+GenericName[el]=Περιηγητής ιστού
+GenericName[es]=Navegador web
+GenericName[fa]=مرورگر اینترنتی
+GenericName[fi]=WWW-selain
+GenericName[fr]=Navigateur Web
+GenericName[hu]=Webböngésző
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブ・ブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[nb]=Nettleser
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[no]=Nettleser
+GenericName[pl]=Przeglądarka WWW
+GenericName[pt]=Navegador Web
+GenericName[pt_BR]=Navegador Web
+GenericName[ru]=Интернет-браузер
+GenericName[sk]=Internetový prehliadač
+GenericName[sv]=Webbläsare
+X-GNOME-FullName=Firefox ESR Web Browser
+X-GNOME-FullName[bg]=Интернет браузър (Firefox ESR)
+X-GNOME-FullName[ca]=Navegador web Firefox ESR
+X-GNOME-FullName[cs]=Firefox ESR Webový prohlížeč
+X-GNOME-FullName[el]=Περιηγήτης Ιστού Firefox ESR
+X-GNOME-FullName[es]=Navegador web Firefox ESR
+X-GNOME-FullName[fa]=مرورگر اینترنتی Firefox ESR
+X-GNOME-FullName[fi]=Firefox ESR-selain
+X-GNOME-FullName[fr]=Navigateur Web Firefox ESR
+X-GNOME-FullName[hu]=Firefox ESR webböngésző
+X-GNOME-FullName[it]=Firefox ESR Browser Web
+X-GNOME-FullName[ja]=Firefox ESR ウェブ・ブラウザ
+X-GNOME-FullName[ko]=Firefox ESR 웹 브라우저
+X-GNOME-FullName[nb]=Firefox ESR Nettleser
+X-GNOME-FullName[nl]=Firefox ESR webbrowser
+X-GNOME-FullName[nn]=Firefox ESR Nettlesar
+X-GNOME-FullName[no]=Firefox ESR Nettleser
+X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
+X-GNOME-FullName[pt]=Firefox ESR Navegador Web
+X-GNOME-FullName[pt_BR]=Navegador Web Firefox ESR
+X-GNOME-FullName[ru]=Интернет-браузер Firefox ESR
+X-GNOME-FullName[sk]=Internetový prehliadač Firefox ESR
+X-GNOME-FullName[sv]=Webbläsaren Firefox ESR
+Exec=/usr/lib/firefox-esr/firefox-esr %u --allow-downgrade
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=firefox-esr
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Firefox-esr
+StartupNotify=true
--- a/roles/lmn_qgm/files/qgm-login.sh
+++ b/roles/lmn_qgm/files/qgm-login.sh
@ -19,4 +19,8 @@ echo "cp /usr/share/applications/qgm-abmelden.desktop $DESKDIR/qgm-abmelden.desk
 cp /usr/share/applications/qgm-abmelden.desktop $DESKDIR/qgm-abmelden.desktop
 chmod 755 $DESKDIR/qgm-abmelden.desktop

+# user-places löschen, wegen Schuljahreswechsel...
+echo "rm $HOME/.local/share/user-places.xbel" >> /tmp/login.log
+rm $HOME/.local/share/user-places.xbel
+
 echo "Done" >> /tmp/login.log
--- a/roles/lmn_qgm/tasks/base.yml
+++ b/roles/lmn_qgm/tasks/base.yml
@ -55,13 +55,13 @@
      - nmap
      - tmux
      - hexyl
+      - meld
      - tree
      - hashcat
      - ttf-mscorefonts-installer
      - libdvd-pkg
      - handbrake
      - firmware-intel-sound
-      - slic3r-prusa
      - cura
      - filius
      - wine
@ -247,6 +247,14 @@
    owner: root
    group: root

+- name: Copy modified Forefox Starter
+  copy: 
+    src: firefox-esr.desktop
+    dest: /usr/share/applications/firefox-esr.desktop
+    mode: '0644'
+    owner: root
+    group: root
+
 - name: Copy logout icon
  copy: 
    src: logout.png  
--- a/roles/lmn_qgsoftware/files/prusaslicer.png
+++ b/roles/lmn_qgsoftware/files/prusaslicer.png
--- a/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop
+++ b/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop
@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Arduino IDE2 AppImage
+Comment=Open-source electronics prototyping platform
+GenericName=Arduino IDE
+Exec=/opt/appimages/arduino2/ArduinoIDE2.AppImage %f
+Icon=arduino
+Type=Application
+Terminal=false
+Categories=Development;Engineering;Electronics;IDE;
+MimeType=text/x-arduino
+Keywords=embedded electronics;electronics;avr;microcontroller;
+StartupWMClass=processing-app-Base
+
--- a/roles/lmn_qgsoftware/files/qg.appimage.PrusaSlicer.desktop
+++ b/roles/lmn_qgsoftware/files/qg.appimage.PrusaSlicer.desktop
@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=Prusa Slicer Appimage
+Name[de]=Prusa Slicer Appimage
+Name[pl]=Prusa Slicer Appimage
+Comment=Slicer for 3d Printing
+GenericName=Slicing App Image
+Exec=/opt/appimages/prusaslicer/PrusaSlicer.AppImage 
+Terminal=false
+Type=Application
+Icon=prusaslicer
+Categories=Graphics;Science;Education;Engineering;
+StartupNotify=true
+MimeType=application/x-extension-fcstd;model/obj;model/iges;image/vnd.dwg;image/vnd.dxf;model/vnd.collada+xml;application/iges;model/iges;model/step;model/step+zip;model/stl;application/vnd.shp;model/vrml;
--- a/roles/lmn_qgsoftware/tasks/install.yml
+++ b/roles/lmn_qgsoftware/tasks/install.yml
@ -54,6 +54,68 @@
    owner: root
    group: root

+########
+# Arduino2 AppImage
+#
+- name: Make sure target dir exists
+  ansible.builtin.file:
+    path: /opt/appimages/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"
+    dest: /opt/appimages/arduino2/ArduinoIDE2.AppImage
+    mode: '0755'
+
+- name: Copy desktop arduino2 starter file to target
+  copy: 
+    src: files/qg.appimage.ArduinoIDE2.desktop   
+    dest: /usr/share/applications/qg.appimage.ArduinoIDE2.desktop
+    mode: '0644'
+    owner: root
+    group: root
+
+
+########
+# Prusa Slicer AppImage
+#
+- name: Make sure target dir exists
+  ansible.builtin.file:
+    path: /opt/appimages/prusaslicer/
+    state: directory
+    recurse: yes
+    owner: root
+    group: root
+    mode: '0755'
+
+- name: Download PrusaSlicer AppImage from Cache
+  ansible.builtin.get_url:
+    url: "{{ mirror_appimage }}/PrusaSlicer.AppImage"
+    dest: /opt/appimages/prusaslicer/PrusaSlicer.AppImage
+    mode: '0755'
+
+- name: Copy desktop PrusaSlicer starter file to target
+  copy: 
+    src: files/qg.appimage.PrusaSlicer.desktop   
+    dest: /usr/share/applications/qg.appimage.PrusaSlicer.desktop
+    mode: '0644'
+    owner: root
+
+- name: Copy desktop Prusaslicer icon file to target
+  copy: 
+    src: files/prusaslicer.png   
+    dest: /usr/share/icons/prusaslicer.png
+    mode: '0644'
+    owner: root
+    group: root
+    group: root
+
+
 ########
 # Logseq AppImage
 #
--- a/roles/qgm_updatecache/tasks/download.yml
+++ b/roles/qgm_updatecache/tasks/download.yml
@ -37,7 +37,6 @@
  when: not bjtf.stat.exists

 #### Freecad
-
 - name: Check if freecad target-file exists
  delegate_to: localhost
  stat:
@ -49,6 +48,49 @@
  command: wget {{ freecadFullURI }} -O {{ freecadTargetFile }}
  when: not fctf.stat.exists

+#### Arduino
+- name: Check if arduino2 target-file exists
+  delegate_to: localhost
+  stat:
+    path: "{{ arduinoTargetFile }}"
+  register: artf
+
+- name: Download Arduino AppImage
+  delegate_to: localhost
+  command: wget {{ arduinoFullURI }} -O {{ arduinoTargetFile }}
+  when: not artf.stat.exists
+
+#### Prusa Slicer
+- name: Check if PrusaSlicer target-file exists
+  delegate_to: localhost
+  stat:
+    path: "{{ prusaTargetFile }}"
+  register: prtf
+
+- name: Create unzip dir for prusaslicer
+  ansible.builtin.file:
+    path: /tmp/prusaslicer.tmp
+    state: directory
+
+- name: Download and unpack PrusaSlicer Zip-Archive
+  delegate_to: localhost
+  unarchive: 
+    src: "{{ prusaFullURI }}"
+    dest: /tmp/prusaslicer.tmp
+    remote_src: yes
+  when: not prtf.stat.exists
+
+- name: Copy Prusyslicer Appimage to cache
+  copy:
+    src: "{{ item }}"
+    dest: "{{ prusaTargetFile }}"
+  with_fileglob:
+    - "/tmp/prusaslicer.tmp/*newer-distros*"
+
+##command: wget {{ prusaFullURI }} -O /tmp/prusaslicer.zip
+
+###{{ freecadTargetFile }}
+
 #### Logseq

 - name: Check if logseq target-file exists
--- a/vars-qgsoftware.yml
+++ b/vars-qgsoftware.yml
@ -1,10 +1,10 @@
 #### Bluej/Greenfoot
 ## Bluej/Greenfoot Versionen
 ## Für Updates anpassen
-bluej_target_version: "5.4.0"
-greenfoot_target_version: "3.8.2"
+bluej_target_version: "5.4.1"
+greenfoot_target_version: "3.9.0"
 ## --
-greenfoot_src_uri: https://www.greenfoot.org/download/files/Greenfoot-linux-VERSION.deb
+greenfoot_src_uri: https://www.greenfoot.org/download/files/Greenfoot-linux-x64-VERSION.deb
 bluej_src_uri: https://www.bluej.org/download/files/BlueJ-linux-x64-VERSION.deb
 mirror_javadev: http://netboot.qgm.lan/javadev/

@ -19,11 +19,20 @@ scratch_install_name: scratch_offline.deb
 mirror_appimage: http://netboot.qgm.lan/appimage/

 #### FreeCAD Appimage
-freecadFullURI: https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/0.21.2/FreeCAD_0.21.2-2023-12-17-conda-Linux-x86_64-py310.AppImage
+#freecadFullURI: https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/0.21.2/FreeCAD_0.21.2-2023-12-17-conda-Linux-x86_64-py310.AppImage
+freecadFullURI: https://github.com/FreeCAD/FreeCAD/releases/download/1.0.0/FreeCAD_1.0.0-conda-Linux-x86_64-py311.AppImage
 freecadTargetFile: /var/www/html/appimage/FreeCAD.AppImage

+#### PrusaSlicer AppImage
+prusaFullURI: https://cdn.prusa3d.com/downloads/drivers/prusa3d_linux_2_8_1.zip
+prusaTargetFile: /var/www/html/appimage/PrusaSlicer.AppImage
+
+#### Arduino2 AppImage
+arduinoFullURI: https://downloads.arduino.cc/arduino-ide/arduino-ide_2.3.4_Linux_64bit.AppImage
+arduinoTargetFile: /var/www/html/appimage/ArduinoIDE2.AppImage
+
 #### Logseq Appimage
-logseqFullURI: https://github.com/logseq/logseq/releases/download/0.10.8/Logseq-linux-x64-0.10.8.AppImage
+logseqFullURI: https://github.com/logseq/logseq/releases/download/0.10.9/Logseq-linux-x64-0.10.9.AppImage
 logseqTargetFile: /var/www/html/appimage/Logseq.AppImage

 #### Digital circuit simulation