Merge branch 'master' into scurl-improvements

.github/workflows/builds.yml

@@ -0,0 +1,65 @@
+name: docker build
+# on: [push]
+on:
+    push:
+        paths:
+            - 'usr/bin/installer-dist'
+            - '.github/workflows/builds.yml'
+
+jobs:
+    changes:
+        runs-on: ubuntu-22.04
+        permissions:
+            pull-requests: read
+        outputs:
+            builds: ${{ steps.filter.outputs.builds }}
+            installer: ${{ steps.filter.outputs.installer }}
+        steps:
+            - uses: actions/checkout@v3
+            - uses: dorny/paths-filter@v2
+              id: filter
+              with:
+                filters: |
+                    installer:
+                        - 'usr/bin/installer-dist'
+                    builds:
+                        - '.github/workflows/builds.yml'
+
+    build:
+        needs: changes
+        # if: ${{ (needs.changes.outputs.installer == 'true') }}
+        # if: ${{ (needs.changes.outputs.builds == 'true') }}
+        if: ${{ (needs.changes.outputs.installer == 'true' || needs.changes.outputs.builds == 'true') }}
+        ## Github takes too long to set the current latest image, this is
+        ## why we set it manually.
+        ##  https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
+        runs-on: ubuntu-22.04
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - image: debian:oldstable
+                    - image: debian:stable
+                    - image: ubuntu:latest
+                    - image: linuxmintd/mint21-amd64:latest
+
+        container:
+            image: ${{ matrix.image }}
+
+        steps:
+            - uses: actions/checkout@v3
+            - name: System Basic Packages
+              run: apt-get update -y && apt-get install -y shellcheck sudo
+            - name: System information
+              run: cat /etc/os-release; uname -a; echo "${PATH}"; cat /etc/sudoers; ls /etc/sudoers.d;
+            - name: Normal user with sudo privileges
+              run: |
+                  adduser --gecos "" --disabled-password user
+                  usermod -aG sudo user
+                  echo "%sudo ALL=(ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/user
+            - name: Run Installer
+              run: su -s /bin/bash user -- usr/bin/installer-dist -n -l debug -k -D --ci
+            - name: Run Installer ShellCheck
+              run: shellcheck usr/bin/installer-dist
+
+# vim: sw=4

.gitignore

@@ -0,0 +1,13 @@
+*.swp
+debian/debhelper-build-stamp
+debian/files
+debian/*.debhelper*
+debian/*.postinst.debhelper
+debian/*.postrm.debhelper
+debian/*.preinst.debhelper
+debian/*.prerm.debhelper
+debian/*.substvars
+debian/usability-misc/
+*-build-deps_*.deb
+*-build-deps_*.buildinfo
+*-build-deps_*.changes

COPYING

@@ -1,7 +1,24 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2012 - 2022 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+Copyright: 2012-2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+License: GPL-3+-with-additional-terms-1
+
+Files: usr/bin/installer-dist
+Copyright: 2022-2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+           2022-2022 grass <grass@danwin.1210.de>
+           2021-2022 nyxnor <nyxnor@protonmail.com>
+           2016-2019 Dylan Araps
+           2008-2010 Canonical Ltd.
+License: GPL-3+-with-additional-terms-1
+
+Files: usr/share/bash-completion/completions/installer-dist
+ usr/share/zsh/vendor-completions/_installer-dist
+ man/installer-dist.1.ronn
+Copyright: 2022-2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
+           2022-2022 grass <grass@danwin.1210.de>
+License: GPL-3+-with-additional-terms-1
+
 License: GPL-3+-with-additional-terms-1
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

README.md

@@ -24,6 +24,9 @@ is unset and if mousepad is installed.
 Disable sudo default lecture.
 /etc/sudoers.d/sudo-lecture-disable
 
+Add pwfeedback to sudo Defaults so password asterisks are shown while typing.
+/etc/sudoers.d/pwfeedback
+
 xfce4-terminal:
 
 * Disables automatic scroll on output when manually scrolled up to make
@@ -56,12 +59,12 @@ injects "vga=0x0317" into the GRUB_CMDLINE_LINUX_DEFAULT variable.
 1\. Download the APT Signing Key.
 
 ```
-wget https://www.kicksecure.com/derivative.asc
+wget https://www.kicksecure.com/keys/derivative.asc
 ```
 
 Users can [check the Signing Key](https://www.kicksecure.com/wiki/Signing_Key) for better security.
 
-2\. Add the APT Signing Key..
+2\. Add the APT Signing Key.
 
 ```
 sudo cp ~/derivative.asc /usr/share/keyrings/derivative.asc
@@ -70,7 +73,7 @@ sudo cp ~/derivative.asc /usr/share/keyrings/derivative.asc
 3\. Add the derivative repository.
 
 ```
-echo "deb [signed-by=/usr/share/keyrings/derivative.asc] https://deb.kicksecure.com bullseye main contrib non-free" | sudo tee /etc/apt/sources.list.d/derivative.list
+echo "deb [signed-by=/usr/share/keyrings/derivative.asc] https://deb.kicksecure.com bookworm main contrib non-free" | sudo tee /etc/apt/sources.list.d/derivative.list
 ```
 
 4\. Update your package lists.
@@ -103,7 +106,7 @@ NOTE: Replace `generic-package` with the actual name of this package `usability-
 ## Contact ##
 
 * [Free Forum Support](https://forums.kicksecure.com)
-* [Professional Support](https://www.kicksecure.com/wiki/Professional_Support)
+* [Premium Support](https://www.kicksecure.com/wiki/Premium_Support)
 
 ## Donate ##