From 2f072e3441d0045fe1d57e93e8219cb37913ebe2 Mon Sep 17 00:00:00 2001
From: Paul <paul@paulbsd.com>
Date: Fri, 1 Aug 2025 08:37:48 +0200
Subject: [PATCH] updated arduinoide state

---
 states/arduino/install.sls                    | 41 -------------------
 states/arduino/map.jinja                      |  5 ---
 states/{arduino => arduinoide}/defaults.yaml  |  2 +-
 states/{arduino => arduinoide}/init.sls       |  0
 states/arduinoide/install.sls                 | 41 +++++++++++++++++++
 states/arduinoide/map.jinja                   |  5 +++
 .../templates/arduino-arduinoide.desktop.j2   |  0
 7 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 states/arduino/install.sls
 delete mode 100644 states/arduino/map.jinja
 rename states/{arduino => arduinoide}/defaults.yaml (90%)
 rename states/{arduino => arduinoide}/init.sls (100%)
 create mode 100644 states/arduinoide/install.sls
 create mode 100644 states/arduinoide/map.jinja
 rename states/{arduino => arduinoide}/templates/arduino-arduinoide.desktop.j2 (100%)

diff --git a/states/arduino/install.sls b/states/arduino/install.sls
deleted file mode 100644
index f72b9ec..0000000
--- a/states/arduino/install.sls
+++ /dev/null
@@ -1,41 +0,0 @@
----
-{%- from "arduino/map.jinja" import arduino with context %}
-arduino-archive-extract:
-  archive.extracted:
-    - name: {{ arduino.release_dir }}
-    - source: {{ arduino.mirror }}/arduino-{{ arduino.version }}-{{ arduino.arch }}.tar.xz
-    - skip_verify: true
-    - archive_format: tar
-    - keep: true
-    - if_missing: {{ arduino.release_dir }}/arduino-{{ arduino.version }}
-
-arduino-symlink:
-  file.symlink:
-    - name: {{ arduino.install_dir }}/arduino
-    - target: {{ arduino.release_dir }}/arduino-{{ arduino.version }}
-    - force: true
-    - onchanges:
-      - arduino-archive-extract
-
-arduino-bin-symlink:
-  file.symlink:
-    - name: /usr/bin/arduino
-    - target: {{ arduino.install_dir }}/arduino-{{ arduino.version }}/arduino
-    - force: true
-    - onchanges:
-      - arduino-archive-extract
-
-arduino-shortcut:
-  file.managed:
-    - name: /usr/share/applications/arduino-arduinoide.desktop
-    - source: salt://arduino/templates/arduino-arduinoide.desktop.j2
-    - template: jinja
-    - user: root
-    - group: root
-    - mode: 644
-
-arduino-cleanup:
-  software.cleanup:
-    - name: arduino
-    - path: {{ arduino.release_dir }}
-    - version: "{{ arduino.version }}"
diff --git a/states/arduino/map.jinja b/states/arduino/map.jinja
deleted file mode 100644
index a3f6437..0000000
--- a/states/arduino/map.jinja
+++ /dev/null
@@ -1,5 +0,0 @@
-{%- import_yaml "arduino/defaults.yaml" as default_settings -%}
-
-{%- set defaults = salt['grains.filter_by'](default_settings, default='arduino') -%}
-
-{%- set arduino = salt['pillar.get']('arduino', default=defaults, merge=True) -%}
\ No newline at end of file
diff --git a/states/arduino/defaults.yaml b/states/arduinoide/defaults.yaml
similarity index 90%
rename from states/arduino/defaults.yaml
rename to states/arduinoide/defaults.yaml
index 6a3b74a..725f8c4 100644
--- a/states/arduino/defaults.yaml
+++ b/states/arduinoide/defaults.yaml
@@ -1,5 +1,5 @@
 ---
-arduino:
+arduinoide:
   mirror: https://downloads.arduino.cc
   install_dir: /usr/local/apps
   release_dir: /usr/local/apps/releases
diff --git a/states/arduino/init.sls b/states/arduinoide/init.sls
similarity index 100%
rename from states/arduino/init.sls
rename to states/arduinoide/init.sls
diff --git a/states/arduinoide/install.sls b/states/arduinoide/install.sls
new file mode 100644
index 0000000..17f04ec
--- /dev/null
+++ b/states/arduinoide/install.sls
@@ -0,0 +1,41 @@
+---
+{%- from "arduinoide/map.jinja" import arduinoide with context %}
+arduinoide-archive-extract:
+  archive.extracted:
+    - name: {{ arduinoide.release_dir }}
+    - source: {{ arduinoide.mirror }}/arduino-{{ arduinoide.version }}-{{ arduinoide.arch }}.tar.xz
+    - skip_verify: true
+    - archive_format: tar
+    - keep: true
+    - if_missing: {{ arduinoide.release_dir }}/arduino-{{ arduinoide.version }}
+
+arduinoide-symlink:
+  file.symlink:
+    - name: {{ arduinoide.install_dir }}/arduino
+    - target: {{ arduinoide.release_dir }}/arduino-{{ arduinoide.version }}
+    - force: true
+    - onchanges:
+      - arduinoide-archive-extract
+
+arduinoide-bin-symlink:
+  file.symlink:
+    - name: /usr/bin/arduino
+    - target: {{ arduinoide.install_dir }}/arduino-{{ arduinoide.version }}/arduino
+    - force: true
+    - onchanges:
+      - arduinoide-archive-extract
+
+arduinoide-shortcut:
+  file.managed:
+    - name: /usr/share/applications/arduino-arduinoide.desktop
+    - source: salt://arduinoide/templates/arduino-arduinoide.desktop.j2
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+
+arduinoide-cleanup:
+  software.cleanup:
+    - name: arduino
+    - path: {{ arduinoide.release_dir }}
+    - version: "{{ arduinoide.version }}"
diff --git a/states/arduinoide/map.jinja b/states/arduinoide/map.jinja
new file mode 100644
index 0000000..0655e1a
--- /dev/null
+++ b/states/arduinoide/map.jinja
@@ -0,0 +1,5 @@
+{%- import_yaml "arduinoide/defaults.yaml" as default_settings -%}
+
+{%- set defaults = salt['grains.filter_by'](default_settings, default='arduinoide') -%}
+
+{%- set arduinoide = salt['pillar.get']('arduinoide', default=defaults, merge=True) -%}
\ No newline at end of file
diff --git a/states/arduino/templates/arduino-arduinoide.desktop.j2 b/states/arduinoide/templates/arduino-arduinoide.desktop.j2
similarity index 100%
rename from states/arduino/templates/arduino-arduinoide.desktop.j2
rename to states/arduinoide/templates/arduino-arduinoide.desktop.j2