A

README.md

@@ -127,3 +127,7 @@ You can also check these information manually by looking in the file header,
 a companion `.license` file or in `.reuse/dep5`.
 
 All licenses are present in the LICENSES directory.
+
+Note that submodules have their own licenses and copyrights statements, please
+check each one individually using the same methods described above for a full
+statement.

qusal/browser/install-chrome.sls

@@ -12,16 +12,6 @@ include:
 {% from 'utils/macros/install-repo.sls' import install_repo -%}
 {{ install_repo(sls_path, 'chrome') }}
 
-{#
-"{{ slsdotpath }}-google-chrome-repo":
-  pkgrepo.managed:
-    - name: deb [signed-by=/usr/share/keyrings/chrome.asc] http://dl.google.com/linux/chrome/deb/
-    - dist: {{ grains.get['oscodename'] }}
-    - comps: main
-    - key_url: salt://{{ slsdotpath }}/files/repo/chrome.asc
-    - file: /etc/apt/sources.list.d/chrome.list
-#}
-
 "{{ slsdotpath }}-avoid-chrome-installing-own-repo":
   file.touch:
     - name: /etc/default/google-chrome

qusal/docker/install-repo.sls

@@ -9,50 +9,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 {% from 'utils/macros/install-repo.sls' import install_repo -%}
 {{ install_repo(sls_path, 'docker') }}
 
-"{{ slsdotpath }}-updated":
-  pkg.uptodate:
-    - refresh: True
-
-{% set pkg = {
-    'Debian': {
-      'pkg_removed': ['docker.io', 'docker-doc', 'docker-compose',
-                      'podman-docker', 'containerd', 'runc'],
-    },
-    'RedHat': {
-      'pkg_removed': ['docker', 'docker-client', 'docker-client-latest',
-                      'docker-common', 'docker-latest',
-                      'docker-latest-logrotate', 'docker-logrotate',
-                      'docker-selinux', 'docker-engine-selinux',
-                      'docker-engine'],
-    },
-}.get(grains.os_family) -%}
-
-{#
-"{{ slsdotpath }}-removed-os-specific":
-  pkg.removed:
-    - pkgs: {{ pkg.pkg_removed|sequence|yaml }}
-#}
-
-"{{ slsdotpath }}-installed":
-  pkg.installed:
-    - refresh: True
-    - install_recommends: False
-    - skip_suggestions: True
-    - pkgs:
-      - qubes-core-agent-networking
-      - man-db
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-      - docker-buildx-plugin
-      - docker-compose-plugin
-
-"{{ slsdotpath }}-user-in-docker-group":
-  user.present:
-    - name: user
-    - groups:
-      - user
-      - qubes
-      - docker
-
 {% endif -%}

qusal/docker/install.sls

@@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 {% if grains['nodename'] != 'dom0' -%}
 
-{% from 'utils/macros/install-repo.sls' import install_repo -%}
+include:
-{{ install_repo(sls_path, 'docker') }}
+  - docker.install-repo
 
 "{{ slsdotpath }}-updated":
   pkg.uptodate:

qusal/reader/create.sls

@@ -20,8 +20,8 @@ prefs:
 - maxmem: 2000
 features:
 - set:
-  - default-menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop libreoffice-base.desktop libreoffice-calc.desktop libreoffice-draw.desktop libreoffice-impress.desktop libreoffice-math.desktop libreoffice-startcenter.desktop libreoffice-writer.desktop org.gnome.Evince.desktop qubes-open-file-manager.desktop"
+  - default-menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop libreoffice-base.desktop libreoffice-calc.desktop libreoffice-draw.desktop libreoffice-impress.desktop libreoffice-math.desktop libreoffice-startcenter.desktop libreoffice-writer.desktop org.gnome.Evince.desktop qubes-open-file-manager.desktop" # noqa: 204
-  - menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop libreoffice-base.desktop libreoffice-calc.desktop libreoffice-draw.desktop libreoffice-impress.desktop libreoffice-math.desktop libreoffice-startcenter.desktop libreoffice-writer.desktop org.gnome.Evince.desktop qubes-open-file-manager.desktop"
+  - menu-items: "firefox-esr.desktop chromium.desktop google-chrome.desktop qubes-run-terminal.desktop qubes-start.desktop libreoffice-base.desktop libreoffice-calc.desktop libreoffice-draw.desktop libreoffice-impress.desktop libreoffice-math.desktop libreoffice-startcenter.desktop libreoffice-writer.desktop org.gnome.Evince.desktop qubes-open-file-manager.desktop" # noqa: 204
 {%- endload %}
 {{ load(defaults) }}
 

scripts/salt-lint.sh

@@ -25,8 +25,8 @@ elif command -v fdfind >/dev/null; then
 fi
 
 case "${find_tool}" in
-  fd|fdfind) files="minion.d/qusal.conf $(${find_tool} . qusal/ --max-depth=1 --type=f --extension=sls --extension=top)";;
+  fd|fdfind) files="minion.d/qusal.conf $(${find_tool} . qusal/ --max-depth=2 --type=f --extension=sls --extension=top)";;
-  find) files="minion.d/qusal.conf $(find qusal/* -maxdepth 1 -type f \( -name '*.sls' -o -name '*.top' \))";;
+  find) files="minion.d/qusal.conf $(find qusal/* -maxdepth 2 -type f \( -name '*.sls' -o -name '*.top' \))";;
 esac
 
 salt-lint ${conf} ${files}

scripts/shell-lint.sh

@@ -33,14 +33,19 @@ case "${find_tool}" in
               --exec sh -c '
               case $( file -bi "$1" ) in (*/x-shellscript*)
                 printf "%s\n" "$1";; esac' sh)"
-    files="${files} $(${find_tool} . --max-depth=1 --type=f --extension=sh)"
+    ## No Shebang
+    sh_files="$(${find_tool} rc.local qusal/ --type=f)"
     ;;
   find)
     files="$(find scripts/ "${group}"/ -not \( -path "*/zsh" -prune \) -type f -exec sh -c '
               case $( file -bi "$1" ) in (*/x-shellscript*) exit 0;; esac
               exit 1' sh {} \; -print)"
-    files="${files} $(find . -maxdepth 1 -type f -name "*.sh")"
+    ## No Shebang
+    sh_files="$(find "${group}"/ -type f -name "rc.local")"
     ;;
 esac
 
+files="$(echo "$files" | sort -u)"
+sh_files="$(echo "$sh_files" | sort -u)"
 shellcheck ${files}
+shellcheck -s sh ${sh_files}