penguins-eggs 8.1.3 → 9.0.16

package/scripts/eggs.bash

@@ -1,13 +1,19 @@
 #!/usr/bin/env bash
 
-_eggs()
+# This function joins an array using a character passed in
+# e.g. ARRAY=(one two three) -> join_by ":" ${ARRAY[@]} -> "one:two:three"
+function join_by { local IFS="$1"; shift; echo "$*"; }
+
+_eggs_autocomplete()
 {
 
-  local cur="${COMP_WORDS[COMP_CWORD]}" opts IFS=$' \t\n'
+  local cur="${COMP_WORDS[COMP_CWORD]}" opts normalizedCommand colonPrefix IFS=$' \t\n'
   COMPREPLY=()
 
   local commands="
 adapt --verbose --help
+analyze --help --verbose
+bro --help
 calamares --help --verbose --install --final --remove --theme
 config --nointeractive --clean --help --verbose
 dad --help --clean --default --verbose
@@ -15,39 +21,82 @@ export:deb --help --clean --amd64 --i386 --armel --arm64 --all
 export:docs --help
 export:iso --help --backup --clean
 info --verbose --help
-install --cli --mx --help --verbose
+install --cli --crypted --help --verbose
 kill --help --verbose
 mom --help
 produce --prefix --basename --backup --fast --normal --max --verbose --yolk --script --help --theme --addons --release
 remove --purge --autoremove --help --verbose
+syncfrom --krill --file --help --verbose
+syncto --krill --file --help --verbose
 tools:clean --help --verbose
 tools:locales --help --reinstall --verbose
 tools:skel --help --user --verbose
 tools:stat --help --month --year
 tools:yolk --help --verbose
-update --help --apt --basket --npm --verbose
+update --help --apt --basket --verbose
+help --nested-commands
+version 
 autocomplete --refresh-cache
-help --all
 "
 
+  function __trim_colon_commands()
+  {
+    # Turn $commands into an array
+    commands=("${commands[@]}")
+
+    if [[ -z "$colonPrefix" ]]; then
+      colonPrefix="$normalizedCommand:"
+    fi
+
+    # Remove colon-word prefix from $commands
+    commands=( "${commands[@]/$colonPrefix}" )
+
+    for i in "${!commands[@]}"; do
+      if [[ "${commands[$i]}" == "$normalizedCommand" ]]; then
+        # If the currently typed in command is a topic command we need to remove it to avoid suggesting it again
+        unset "${commands[$i]}"
+      else
+        # Trim subcommands from each command
+        commands[$i]="${commands[$i]%%:*}"
+      fi
+    done
+  }
+
   if [[ "$cur" != "-"* ]]; then
-    opts=$(printf "$commands" | grep -Eo '^[a-zA-Z0-9:_-]+')
-  else
-    local __COMP_WORDS
-    if [[ ${COMP_WORDS[2]} == ":" ]]; then
-      #subcommand
-      __COMP_WORDS=$(printf "%s" "${COMP_WORDS[@]:1:3}")
+    # Command
+    __COMP_WORDS=( "${COMP_WORDS[@]:1}" )
+
+    # The command typed by the user but separated by colons (e.g. "mycli command subcom" -> "command:subcom")
+    normalizedCommand="$( printf "%s" "$(join_by ":" "${__COMP_WORDS[@]}")" )"
+
+    # The command hirarchy, with colons, leading up to the last subcommand entered (e.g. "mycli com subcommand subsubcom" -> "com:subcommand:")
+    colonPrefix="${normalizedCommand%"${normalizedCommand##*:}"}"
+
+    if [[ -z "$normalizedCommand" ]]; then
+      # If there is no normalizedCommand yet the user hasn't typed in a full command
+      # So we should trim all subcommands & flags from $commands so we can suggest all top level commands
+      opts=$(printf "%s " "${commands[@]}" | grep -Eo '^[a-zA-Z0-9_-]+')
     else
-      #simple command
-      __COMP_WORDS="${COMP_WORDS[@]:1:1}"
+      # Filter $commands to just the ones that match the $normalizedCommand and turn into an array
+      commands=( $(compgen -W "$commands" -- "${normalizedCommand}") )
+      # Trim higher level and subcommands from the subcommands to suggest
+      __trim_colon_commands "$colonPrefix"
+
+      opts=$(printf "%s " "${commands[@]}") # | grep -Eo '^[a-zA-Z0-9_-]+'
     fi
-    opts=$(printf "$commands" | grep "${__COMP_WORDS}" | sed -n "s/^${__COMP_WORDS} //p")
+  else 
+    # Flag
+
+    # The full CLI command separated by colons (e.g. "mycli command subcommand --fl" -> "command:subcommand")
+    # This needs to be defined with $COMP_CWORD-1 as opposed to above because the current "word" on the command line is a flag and the command is everything before the flag
+    normalizedCommand="$( printf "%s" "$(join_by ":" "${COMP_WORDS[@]:1:($COMP_CWORD - 1)}")" )"
+
+    # The line below finds the command in $commands using grep
+    # Then, using sed, it removes everything from the found command before the --flags (e.g. "command:subcommand:subsubcom --flag1 --flag2" -> "--flag1 --flag2")
+    opts=$(printf "%s " "${commands[@]}" | grep "${normalizedCommand}" | sed -n "s/^${normalizedCommand} //p")
   fi
-  _get_comp_words_by_ref -n : cur
-  COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-  __ltrim_colon_completions "$cur"
-  return 0
 
+  COMPREPLY=($(compgen -W "$opts" -- "${cur}"))
 }
 
-complete -o default -F _eggs eggs
+complete -F _eggs_autocomplete eggs

package/scripts/mom-cli.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Authors: Piero Proietti, Christopher Hopp
+# xdg-settings get default-web-browser
 
 ##
 # eggs dialog cli
@@ -159,18 +160,18 @@ function documentation {
 
 ################################
 function documentation_book {
-   sensible-browser "https://penguins-eggs.net/book/italiano"
+   xdg-open "https://penguins-eggs.net/book/italiano"
 }
 
 ################################
 function documentation_book_translated {
    # sensible-editor sensible-pager
-   sensible-browser "https://translate.google.com/translate?hl=en&sl=auto&tl=en&u=https%3A%2F%2Fpenguins-eggs.net%2Fbook%2Fitaliano"
+   xdg-open "https://translate.google.com/translate?hl=en&sl=auto&tl=en&u=https%3A%2F%2Fpenguins-eggs.net%2Fbook%2Fitaliano"
 }
 
 ################################
 function documentation_site {
-   sensible-browser "https://penguins-eggs.net"
+   xdg-open "https://penguins-eggs.net"
 }
 
 ################################
@@ -181,7 +182,7 @@ function documentation_man {
 
 ################################
 function documentation_html {
-   sensible-browser "file:///usr/lib/penguins-eggs/manpages/doc/man/eggs.1.html"
+   xdg-open "file:///usr/lib/penguins-eggs/manpages/doc/man/eggs.html"
 }
 
 
@@ -336,7 +337,7 @@ function tools {
       "clean"     "clean system logs, apt cache, etc" \
       "locales"   "install/clean locales" \
       "skel"      "update /etc/skel from current user or user configuration" \
-      "yolk"      "configure an internal apt repository in /usr/local/yolk" \
+      "yolk"      "configure an internal apt repository in /var/local/yolk" \
       "quit"   "previous" 3>&2 2>&1 1>&3
    )
 

package/scripts/not-used/eggs-cleanup.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+MOTD=/etc/motd
+ISSUE=/etc/issue
+/usr/bin/sed -i '/^eggs-start-message/,/^\eggs-end-message/{/^#/!{/^\$/!d;};}' ${MOTD}
+/usr/bin/sed -i '/^eggs-start-message/,/^\eggs-end-message/{/^#/!{/^\$/!d;};}' ${ISSUE}
+exit 0

package/scripts/not-used/install-eggs-ppa.sh

@@ -0,0 +1,2 @@
+curl -SsL https://pieroproietti.github.io/penguins-eggs-ppa/debian/KEY.gpg | sudo apt-key add -
+sudo curl -s --compressed -o /etc/apt/sources.list.d/penguins-eggs-ppa.list "https://pieroproietti.github.io/penguins-eggs-ppa/debian/penguins-eggs-ppa.list"

package/addons/debian/theme/applications/install-debian.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install Debian
-GenericName=Calamares Installer
-Exec=/sbin/install-debian
-Comment=Calamares — Installer for Debian Live
-Keywords=calamares;system;install;debian;installer
-Icon=install-debian
-Terminal=false
-Categories=Qt;System;
-StartupWMClass=calamares
-StartupNotify=True

package/addons/debian/theme/branding/branding.desc

@@ -1,27 +0,0 @@
----
-componentName:   debian
-welcomeStyleCalamares: true
-
-strings:
-    productName:         Debian GNU/Linux
-    shortProductName:    Debian testing
-    version:             11 (bullseye)
-    shortVersion:        11
-    versionedName:       Debian 11 (bullseye)
-    shortVersionedName:  Debian 11
-    bootloaderEntryName: Debian
-    productUrl:          https://debian.org
-    supportUrl:          https://www.debian.org/support
-    releaseNotesUrl:     https://www.debian.org/releases/bullseye/releasenotes
-
-images:
-    productLogo:         "debian-logo.png"
-    productIcon:         "debian-logo.png"
-    productWelcome:      "welcome.png"
-
-slideshow:               "show.qml"
-
-style:
-   sidebarBackground:    "#2c3133"
-   sidebarText:          "#FFFFFF"
-   sidebarTextSelect:    "#4d7079"

package/addons/debian/theme/branding/show.qml

@@ -1,51 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018-2019, Jonathan Carter <jcc@debian.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, or (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Timer {
-        interval: 20000
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-
-    Slide {
-        Image {
-            id: background1
-            source: "slide1.png"
-            width: 467; height: 280
-            fillMode: Image.PreserveAspectFit
-            anchors.centerIn: parent
-        }
-        Text {
-            anchors.horizontalCenter: background1.horizontalCenter
-            anchors.top: background1.bottom
-            text: "Welcome to Debian GNU/Linux.<br/>"+
-                  "The rest of the installation is automated and should complete in a few minutes."
-            wrapMode: Text.WordWrap
-            width: 600
-            horizontalAlignment: Text.Center
-        }
-    }
-
-}

package/addons/deblinux/theme/README.md

@@ -1,16 +0,0 @@
-# deblinux 
-
-Tema per eggs di deblinux:
-
-E' costituito da 3 cartelle: 
-* applications
-* artwork
-* branding
-
-in applications va il link per il desktop che avvia calamares. 
-Il nome DEVE essere install-debian.desktop, la icona DEVE essere denominata install-debian.png,
-va messa nella directory artwork. Nella directory branding, che verrò copiata in
-/etc/calamares/branding/deblinux andrà messa la configurazione della presentazione di calamares.
-
-Fare possibilmente riferimento ai nomi utilizzati e, vediamo se sarà possibile in futuro
-una maggiore integrazione.

package/addons/deblinux/theme/applications/install-debian.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install DebLinux
-GenericName=Calamares Installer
-Exec=/sbin/install-debian
-Comment=Calamares — Installer for Debian Live
-Keywords=calamares;system;install;debian;installer
-Icon=install-debian
-Terminal=false
-Categories=Qt;System;
-StartupWMClass=calamares
-StartupNotify=True

package/addons/deblinux/theme/calamares/branding/branding.desc

@@ -1,23 +0,0 @@
-#versionLike: buster
-componentName: eggs
-welcomeStyleCalamares: true
-strings:
-  productName: deblinux-pc
-  shortProductName: deblinux-pc
-  version: '2019/09/18 08:26-02 ( Emperor)'
-  shortVersion: '2019/09/18 08:26-02'
-  versionedName: deblinux-pc
-  shortVersionedName: Emperor
-  bootloaderEntryName: deblinux-pc
-  productUrl: ''
-  supportUrl: 'https://www.debian.org/support'
-  releaseNotesUrl: 'https://github.com/pieroproietti/penguins-eggs'
-images:
-  productLogo: eggs-logo.png
-  productIcon: eggs-logo.png
-  productWelcome: welcome.png
-slideshow: show.qml
-style:
-  sidebarBackground: '#2c3133'
-  sidebarText: '#FFFFFF'
-  sidebarTextSelect: '#4d7079'

package/addons/deblinux/theme/calamares/branding/show.qml

@@ -1,46 +0,0 @@
-/* === This file is part of Calamares - <http://github.com/calamares> ===
- *
- *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018, Jonathan Carter <jcc@debian.org>
- *
- *   Calamares is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, or (at your option) any later version.
- *
- *   Calamares is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-// https://github.com/calamares/calamares-extensions
-
-
-import QtQuick 2.0;
-import calamares.slideshow 1.0;
-
-Presentation
-{
-    id: presentation
-
-    Timer {
-        interval: 10000
-        running: true
-        repeat: true
-        onTriggered: presentation.goToNextSlide()
-    }
-    Slide {
-        Image {
-            id: slide1
-            source: "slide1.png"
-            anchors.centerIn: parent
-            width: 810
-            height: 485
-            fillMode: Image.PreserveAspectFit
-        }
-    }
-}

package/addons/deblinux/theme/calamares/modules/partition.yml

@@ -1,233 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# This setting specifies the mount point of the EFI system partition. Some
-# distributions (Fedora, Debian, Manjaro, etc.) use /boot/efi, others (KaOS,
-# etc.) use just /boot.
-#
-# Defaults to "/boot/efi", may be empty (but weird effects ensue)
-efiSystemPartition:     "/boot/efi"
-
-# This optional setting specifies the size of the EFI system partition.
-# If nothing is specified, the default size of 300MiB will be used.
-# efiSystemPartitionSize:     300M
-
-# This optional setting specifies the name of the EFI system partition (see
-# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
-# If nothing is specified, the partition name is left unset.
-# efiSystemPartitionName:     EFI
-
-# In autogenerated partitioning, allow the user to select a swap size?
-# If there is exactly one choice, no UI is presented, and the user
-# cannot make a choice -- this setting is used. If there is more than
-# one choice, a UI is presented.
-#
-# Legacy settings *neverCreateSwap* and *ensureSuspendToDisk* correspond
-# to values of *userSwapChoices* as follows:
-#    - *neverCreateSwap* is true, means [none]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is false, [small]
-#    - *neverCreateSwap* is false, *ensureSuspendToDisk* is true, [suspend]
-#
-# Autogenerated swap sizes are as follows:
-#    - *suspend*: Swap is always at least total memory size,
-#      and up to 4GiB RAM follows the rule-of-thumb 2 * memory;
-#      from 4GiB to 8 GiB it stays steady at 8GiB, and over 8 GiB memory
-#      swap is the size of main memory.
-#    - *small*: Follows the rules above, but Swap is at
-#      most 8GiB, and no more than 10% of available disk.
-# In both cases, a fudge factor (usually 10% extra) is applied so that there
-# is some space for administrative overhead (e.g. 8 GiB swap will allocate
-# 8.8GiB on disk in the end).
-#
-# If *file* is enabled here, make sure to have the *fstab* module
-# as well (later in the exec phase) so that the swap file is
-# actually created.
-userSwapChoices:
-    - none      # Create no swap, use no swap
-    - small     # Up to 4GB
-    - suspend   # At least main memory size
-    # - reuse     # Re-use existing swap, but don't create any (unsupported right now)
-    - file      # To swap file instead of partition
-
-# This optional setting specifies the name of the swap partition (see
-# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
-# If nothing is specified, the partition name is left unset.
-# swapPartitionName:      swap
-
-# LEGACY SETTINGS (these will generate a warning)
-# ensureSuspendToDisk:    true
-# neverCreateSwap:        false
-
-# Correctly draw nested (e.g. logical) partitions as such.
-drawNestedPartitions:   false
-
-# Show/hide partition labels on manual partitioning page.
-alwaysShowPartitionLabels: true
-
-# Allow manual partitioning.
-#
-# When set to false, this option hides the "Manual partitioning" button,
-# limiting the user's choice to "Erase", "Replace" or "Alongside".
-# This can be useful when using a custom partition layout we don't want
-# the user to modify.
-#
-# If nothing is specified, manual partitioning is enabled.
-#allowManualPartitioning:   true
-
-# Initial selection on the Choice page
-#
-# There are four radio buttons (in principle: erase, replace, alongside, manual),
-# and you can pick which of them, if any, is initially selected. For most
-# installers, "none" is the right choice: it makes the user pick something specific,
-# rather than accidentally being able to click past an important choice (in particular,
-# "erase" is a dangerous choice).
-#
-# The default is "none"
-#
-initialPartitioningChoice: none
-#
-# Similarly, some of the installation choices may offer a choice of swap;
-# the available choices depend on *userSwapChoices*, above, and this
-# setting can be used to pick a specific one.
-#
-# The default is "none" (no swap) if that is one of the enabled options, otherwise
-# one of the items from the options.
-initialSwapChoice: none
-
-# Default partition table type, used when a "erase" disk is made.
-#
-# When erasing a disk, a new partition table is created on disk.
-# In other cases, e.g. Replace and Alongside, as well as when using
-# manual partitioning, this partition table exists already on disk
-# and it is left unmodified.
-#
-# Suggested values: gpt, msdos
-# If nothing is specified, Calamares defaults to "gpt" if system is
-# efi or "msdos".
-#
-# Names are case-sensitive and defined by KPMCore.
-# defaultPartitionTableType: msdos
-
-# Requirement for partition table type
-#
-# Restrict the installation on disks that match the type of partition
-# tables that are specified.
-#
-# Suggested values: msdos, gpt
-# If nothing is specified, Calamares defaults to both "msdos" and "mbr".
-#
-# Names are case-sensitive and defined by KPMCore.
-# requiredPartitionTableType: gpt
-# or,
-# requiredPartitionTableType:
-#     - msdos
-#     - gpt
-
-# Default filesystem type, used when a "new" partition is made.
-#
-# When replacing a partition, the existing filesystem inside the
-# partition is retained. In other cases, e.g. Erase and Alongside,
-# as well as when using manual partitioning and creating a new
-# partition, this filesystem type is pre-selected. Note that
-# editing a partition in manual-creation mode will not automatically
-# change the filesystem type to this default value -- it is not
-# creating a new partition.
-#
-# Suggested values: ext2, ext3, ext4, reiser, xfs, jfs, btrfs
-# If nothing is specified, Calamares defaults to "ext4".
-#
-# Names are case-sensitive and defined by KPMCore.
-defaultFileSystemType:  "ext4"
-
-# Show/hide LUKS related functionality in automated partitioning modes.
-# Disable this if you choose not to deploy early unlocking support in GRUB2
-# and/or your distribution's initramfs solution.
-#
-# BIG FAT WARNING:
-#
-# This option is unsupported, as it cuts out a crucial security feature.
-# Disabling LUKS and shipping Calamares without a correctly configured GRUB2
-# and initramfs is considered suboptimal use of the Calamares software. The
-# Calamares team will not provide user support for any potential issue that
-# may arise as a consequence of setting this option to false.
-# It is strongly recommended that system integrators put in the work to support
-# LUKS unlocking support in GRUB2 and initramfs/dracut/mkinitcpio/etc.
-# Support is offered to system integrators that wish to do so, through the
-# Calamares bug tracker, as well as in #calamares on Freenode.
-# For more information on setting up GRUB2 for Calamares with LUKS, see
-# https://github.com/calamares/calamares/wiki/Deploy-LUKS
-#
-# If nothing is specified, LUKS is enabled in automated modes.
-#enableLuksAutomatedPartitioning:    true
-
-# Partition layout.
-#
-# This optional setting specifies a custom partition layout.
-#
-# If nothing is specified, the default partition layout is a single partition
-# for root that uses 100% of the space and uses the filesystem defined by
-# defaultFileSystemType.
-#
-# Note: the EFI system partition is prepend automatically to the layout if
-# needed; the swap partition is appended to the layout if enabled (small of
-# suspend).
-#
-# Otherwise, the partition layout is defined as follow:
-#
-# partitionLayout:
-#     - name: "rootfs"
-#       type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
-#       filesystem: "ext4"
-#       mountPoint: "/"
-#       size: 20%
-#       minSize: 500M
-#       maxSize: 10G
-#       attributes: 0xffff000000000003
-#     - name: "home"
-#       type = "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
-#       filesystem: "ext4"
-#       mountPoint: "/home"
-#       size: 3G
-#       minSize: 1.5G
-#       features:
-#         64bit: false
-#         casefold: true
-#     - name: "data"
-#       filesystem: "fat32"
-#       mountPoint: "/data"
-#       features:
-#         sector-size: 4096
-#         sectors-per-cluster: 128
-#       size: 100%
-#
-# There can be any number of partitions, each entry having the following attributes:
-#   - name: filesystem label
-#           and
-#           partition name (gpt only; since KPMCore 4.2.0)
-#   - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - filesystem: filesystem type (optional parameter; fs not created if "unformatted" or unset)
-#   - mountPoint: partition mount point (optional parameter; not mounted if unset)
-#   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
-#           or
-#           % of the available drive space if a '%' is appended to the value
-#   - minSize: minimum partition size (optional parameter)
-#   - maxSize: maximum partition size (optional parameter)
-#   - features: filesystem features (optional parameter; requires KPMCore >= 4.2.0)
-#       name: boolean or integer or string
-
-# Checking for available storage
-#
-# This overlaps with the setting of the same name in the welcome module's
-# requirements section. If nothing is set by the welcome module, this
-# value is used instead. It is still a problem if there is no required
-# size set at all, and the replace and resize options will not be offered
-# if no required size is set.
-#
-# The value is in Gibibytes (GiB).
-#
-# BIG FAT WARNING: except for OEM-phase-0 use, you should be using
-#                  the welcome module, **and** configure this value in
-#                  `welcome.conf`, not here.
-# requiredStorage: 3.5