Merge branch 'main' into dependabot/github_actions/hustcer/setup-nu-3.13

README.md

@@ -24,7 +24,12 @@ These are general guidelines for writing official bash modules and their documen
 - If you want to insert another regular string as a suffix or prefix to the `"${variable_name}"`, you should do that in this format: `"prefix-${variable_name}-suffix"`
 - Use `set -euo pipefail` at the start of the script, to ensure that module will fail the image build if error is caught.
      -  You can also use `set -euxo pipefail` during debugging, where each executed command is printed. This should not be used in a published module. 
-
+- For downloading files, we utilize `curl`. Here's the template for what we're using:  
+  - Download file with differently specified filename:  
+`curl -fLs --create-dirs "${URL}" -o "${DIR}/${FILENAME.EXT}"`  
+  - Download file to directory with no filename changes:  
+`curl -fLs --create-dirs -O "${URL}" --output-dir "${DIR}"`
+
 Using [Shellcheck](https://www.shellcheck.net/) in your editor is recommended.
 
 ### Documentation

cosign.pub

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEk/2hQrKLFNf66dOyCEoUCip38EZh
-I4NQN1BiVQ+6IRXkHCJahZfPtC9RqJ3dpGm/2CSdjKyES+vDQrUFj8vsmg==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3p9P+2gkXsdiSLnfvajHYC3UFcj9
+xpieDNIx7Azav7KtgeqFKKLFWANBA+cb71ch9tuCEftAOtDI7ypL6AHIhQ==
 -----END PUBLIC KEY-----

modules/bling/installers/gnome-vrr.sh

@@ -9,8 +9,12 @@ if [[ $(gnome-shell --version) =~ "46" ]]; then
     exit 1
 fi
 
-wget -O "/etc/yum.repos.d/ublue-os-staging.repo" "https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
+REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
+
+echo "Downloading repo file ${REPO_URL}"
+curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/ublue-os-staging.repo"
+echo "Downloaded repo file ${REPO_URL}"
 
 rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging mutter mutter-common gnome-control-center gnome-control-center-filesystem xorg-x11-server-Xwayland
 
-rm -f /etc/yum.repos.d/ublue-os-staging.repo
+rm -f /etc/yum.repos.d/ublue-os-staging.repo

modules/bling/installers/ublue-update.sh

@@ -28,8 +28,10 @@ fi
 systemctl disable rpm-ostreed-automatic.timer
 
 # Fetch ublue COPR
-REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
-wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
+REPO_URL="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
+echo "Downloading repo file ${REPO_URL}"
+curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
+echo "Downloaded repo file ${REPO_URL}"
 
 # topgrade is REQUIRED by ublue-update to install
 rpm-ostree install topgrade

modules/brew/brew.sh

@@ -75,7 +75,8 @@ touch /.dockerenv
 
 # Always install Brew
 echo "Downloading and installing Brew..."
-curl -Lo /tmp/brew-install https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh
+curl -fLs --create-dirs https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o /tmp/brew-install
+echo "Downloaded Brew install script"
 chmod +x /tmp/brew-install
 /tmp/brew-install
 
@@ -193,8 +194,10 @@ if [[ ! -d "/etc/profile.d/" ]]; then
 fi
 if [[ ! -f "/etc/profile.d/brew.sh" ]]; then
   echo "Apply brew path export fix, to solve path conflicts between system & brew programs with same name"
-  echo "#!/usr/bin/env bash
-[[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"" > "/etc/profile.d/brew.sh"
+  cat > /etc/profile.d/brew.sh <<EOF
+#!/usr/bin/env bash
+[[ -d /home/linuxbrew/.linuxbrew && $- == *i* ]] && eval "\$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+EOF
 fi
 
 # Copy shell configuration files
@@ -234,7 +237,7 @@ fi
 
 # Apply nofile limits if enabled
 if [[ "${NOFILE_LIMITS}" == true ]]; then
-  source "${MODULE_DIRECTORY}"/brew/brew-nofile-limits-logic.sh
+  source "${MODULE_DIRECTORY}/brew/brew-nofile-limits-logic.sh"
 fi
 
 # Disable homebrew analytics if the flag is set to false

modules/chezmoi/chezmoi.sh

@@ -93,7 +93,8 @@ else
 	echo "Checking if curl is installed and executable at /usr/bin/curl"
 	if [ -x /usr/bin/curl ]; then
 		echo "Downloading chezmoi binary from the latest Github release"
-		/usr/bin/curl -Ls https://github.com/twpayne/chezmoi/releases/latest/download/chezmoi-linux-amd64 -o /usr/bin/chezmoi
+		/usr/bin/curl -fLs --create-dirs https://github.com/twpayne/chezmoi/releases/latest/download/chezmoi-linux-amd64 -o /usr/bin/chezmoi
+		echo "Downloaded chezmoi binary and installed into /usr/bin"
 		echo "Ensuring chezmoi is executable"
 		/usr/bin/chmod 755 /usr/bin/chezmoi
 	else

modules/default-flatpaks/README.md

@@ -18,7 +18,7 @@ The scripts are run on every boot by these services:
 
 This module stores the Flatpak remote configuration and Flatpak install/remove lists in `/usr/share/bluebuild/default-flatpaks/`. There are two subdirectories, `user` and `system` corresponding with the install level of the Flatpaks and repositories. Each directory has text files containing the IDs of flatpaks to `install` and `remove`, plus a `repo-info.yml` containing the details of the Flatpak repository.
 
-This module also supports disabling & enabling notifications.
+This module also supports disabling & enabling notifications. If not specified in the recipe, notifications are disabled by default.
 
 ## Local modification
 

modules/default-flatpaks/v1/default-flatpaks.sh

@@ -180,8 +180,12 @@ check_flatpak_id_validity_from_flathub "${1}" "user"
 echo "Configuring default-flatpaks notifications"
 NOTIFICATIONS=$(echo "$1" | yq -I=0 ".notify")
 CONFIG_NOTIFICATIONS="/usr/share/bluebuild/default-flatpaks/notifications"
-cp -r "$MODULE_DIRECTORY"/default-flatpaks/config/notifications "$CONFIG_NOTIFICATIONS"
-echo "$NOTIFICATIONS" >> "$CONFIG_NOTIFICATIONS"
+cp -r "${MODULE_DIRECTORY}/default-flatpaks/config/notifications" "${CONFIG_NOTIFICATIONS}"
+if [[ -z "${NOTIFICATIONS}" ]] || [[ "${NOTIFICATIONS}" == "null" ]]; then
+  echo "false" >> "${CONFIG_NOTIFICATIONS}"
+else
+  echo "${NOTIFICATIONS}" >> "${CONFIG_NOTIFICATIONS}"
+fi
 
 echo "Copying user modification template files"
 

modules/fonts/sources/google-fonts.sh

@@ -8,14 +8,14 @@ echo "Installation of google-fonts started"
 rm -rf "${DEST}"
 
 for FONT in "${FONTS[@]}"; do
-    if [ -n "$FONT" ]; then
+    if [ -n "${FONT}" ]; then
         FONT="${FONT#"${FONT%%[![:space:]]*}"}" # Trim leading whitespace
         FONT="${FONT%"${FONT##*[![:space:]]}"}" # Trim trailing whitespace
         mkdir -p "${DEST}/${FONT}"
 
         readarray -t "FILE_REFS" < <(
             if JSON=$(
-                curl -s "https://fonts.google.com/download/list?family=${FONT// /%20}" | # spaces are replaced with %20 for the URL
+                curl -sf "https://fonts.google.com/download/list?family=${FONT// /%20}" | # spaces are replaced with %20 for the URL
                 tail -n +2 # remove first line, which as of March 2024 contains ")]}'" and breaks JSON parsing
             ); then
                 if FILE_REFS=$(echo "$JSON" | jq -c '.manifest.fileRefs[]' 2>/dev/null); then
@@ -31,7 +31,8 @@ for FONT in "${FONTS[@]}"; do
                 if FILENAME=$(echo "${FILE_REF}" | jq -er '.filename' 2>/dev/null); then
                     if URL=$(echo "${FILE_REF}" | jq -er '.url' 2>/dev/null); then
                         echo "Downloading ${FILENAME} from ${URL}"
-                        curl "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename
+                        curl -fLs --create-dirs "${URL}" -o "${DEST}/${FONT}/${FILENAME##*/}" # everything before the last / is removed to get the filename
+                        echo "Downloaded ${FILENAME}"
                     else
                         echo "Failed to extract URLs for: ${FONT}" >&2
                     fi
@@ -43,4 +44,4 @@ for FONT in "${FONTS[@]}"; do
     fi
 done
 
-fc-cache -f "${DEST}"
+fc-cache --system-only --really-force "${DEST}"

modules/fonts/sources/nerd-fonts.sh

@@ -6,7 +6,7 @@ URL="https://github.com/ryanoasis/nerd-fonts/releases/latest/download"
 DEST="/usr/share/fonts/nerd-fonts"
 
 echo "Installation of nerd-fonts started"
-rm -rf "$DEST"
+rm -rf "${DEST}"
 
 mkdir -p /tmp/fonts
 for FONT in "${FONTS[@]}"; do
@@ -15,11 +15,12 @@ for FONT in "${FONTS[@]}"; do
         mkdir -p "${DEST}/${FONT}"
 
         echo "Downloading ${FONT} from ${URL}/${FONT}.tar.xz"
-
-        curl "${URL}/${FONT}.tar.xz" -L -o "/tmp/fonts/${FONT}.tar.xz"
+        curl -fLs --create-dirs "${URL}/${FONT}.tar.xz" -o "/tmp/fonts/${FONT}.tar.xz"
+        echo "Downloaded ${FONT}"
+
         tar -xf "/tmp/fonts/${FONT}.tar.xz" -C "${DEST}/${FONT}"
     fi
 done
 rm -rf /tmp/fonts
 
-fc-cache -f "${DEST}"
+fc-cache --system-only --really-force "${DEST}"

modules/gnome-extensions/gnome-extensions.sh

@@ -55,7 +55,9 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then
       VERSION=$(echo "${EXTENSION}" | grep -oP 'v\d+')
       echo "Installing ${EXTENSION} Gnome extension with version ${VERSION}"
       # Download archive
-      wget --directory-prefix="${TMP_DIR}" "${URL}"
+      echo "Downloading ZIP archive ${URL}"
+      curl -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}"
+      echo "Downloaded ZIP archive ${URL}"
       # Extract archive
       echo "Extracting ZIP archive"
       unzip "${ARCHIVE_DIR}" -d "${TMP_DIR}" > /dev/null
@@ -98,8 +100,8 @@ if [[ ${#INSTALL[@]} -gt 0 ]]; then
         # Error code example:
         # GLib.FileError: Failed to open file “/usr/share/gnome-shell/extensions/[email protected]/schemas/gschemas.compiled”: open() failed: No such file or directory
         # If any extension produces this error, it can be added in if statement below to solve the problem
-        # Fly-Pie
-        if [[ "${UUID}" == "[email protected]" ]]; then
+        # Fly-Pie or PaperWM
+        if [[ "${UUID}" == "[email protected]" || "${UUID}" == "[email protected]" ]]; then
           install -d -m 0755 "/usr/share/gnome-shell/extensions/${UUID}/schemas/"
           install -D -p -m 0644 "${TMP_DIR}/schemas/"*.gschema.xml "/usr/share/gnome-shell/extensions/${UUID}/schemas/"
           glib-compile-schemas "/usr/share/gnome-shell/extensions/${UUID}/schemas/" &>/dev/null
@@ -133,7 +135,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then
         # Literal-name extension config
         # Replaces whitespaces with %20 for install entries which contain extension name, since URLs can't contain whitespace      
         WHITESPACE_HTML="${INSTALL_EXT// /%20}"
-        URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}")
+        URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}")
         QUERIED_EXT=$(echo "${URL_QUERY}" | jq ".extensions[] | select(.name == \"${INSTALL_EXT}\")")
         if [[ -z "${QUERIED_EXT}" ]] || [[ "${QUERIED_EXT}" == "null" ]]; then
           echo "ERROR: Extension '${INSTALL_EXT}' does not exist in https://extensions.gnome.org/ website"
@@ -158,7 +160,7 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then
         fi
       else
         # PK ID extension config fallback if specified
-        URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-info/?pk=${INSTALL_EXT}")
+        URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-info/?pk=${INSTALL_EXT}")
         PK_EXT=$(echo "${URL_QUERY}" | jq -r '.["pk"]' 2>/dev/null)
         if [[ -z "${PK_EXT}" ]] || [[ "${PK_EXT}" == "null" ]]; then
           echo "ERROR: Extension with PK ID '${INSTALL_EXT}' does not exist in https://extensions.gnome.org/ website"
@@ -182,7 +184,9 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then
       ARCHIVE_DIR="${TMP_DIR}/${ARCHIVE}"
       echo "Installing '${EXT_NAME}' Gnome extension with version ${SUITABLE_VERSION}"
       # Download archive
-      wget --directory-prefix="${TMP_DIR}" "${URL}"
+      echo "Downloading ZIP archive ${URL}"
+      curl -fLs --create-dirs "${URL}" -o "${ARCHIVE_DIR}"
+      echo "Downloaded ZIP archive ${URL}"
       # Extract archive
       echo "Extracting ZIP archive"
       unzip "${ARCHIVE_DIR}" -d "${TMP_DIR}" > /dev/null
@@ -202,8 +206,8 @@ if [[ ${#INSTALL[@]} -gt 0 ]] && ! "${LEGACY}"; then
         # Error code example:
         # GLib.FileError: Failed to open file “/usr/share/gnome-shell/extensions/[email protected]/schemas/gschemas.compiled”: open() failed: No such file or directory
         # If any extension produces this error, it can be added in if statement below to solve the problem
-        # Fly-Pie
-        if [[ "${EXT_UUID}" == "[email protected]" ]]; then
+        # Fly-Pie or PaperWM
+        if [[ "${EXT_UUID}" == "[email protected]" || "${EXT_UUID}" == "[email protected]" ]]; then
           install -d -m 0755 "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/"
           install -D -p -m 0644 "${TMP_DIR}/schemas/"*.gschema.xml "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/"
           glib-compile-schemas "/usr/share/gnome-shell/extensions/${EXT_UUID}/schemas/" &>/dev/null
@@ -237,7 +241,7 @@ if [[ ${#UNINSTALL[@]} -gt 0 ]]; then
         # Replaces whitespaces with %20 for install entries which contain extension name, since URLs can't contain whitespace
         # Getting json query from the website is useful to intuitively uninstall the extension without need to manually input UUID
         WHITESPACE_HTML="${UNINSTALL_EXT// /%20}"
-        URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}")
+        URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-query/?search=${WHITESPACE_HTML}")
         QUERIED_EXT=$(echo "${URL_QUERY}" | jq ".extensions[] | select(.name == \"${UNINSTALL_EXT}\")")
         if [[ -z "${QUERIED_EXT}" ]] || [[ "${QUERIED_EXT}" == "null" ]]; then
           echo "ERROR: Extension '${UNINSTALL_EXT}' does not exist in https://extensions.gnome.org/ website"
@@ -249,7 +253,7 @@ if [[ ${#UNINSTALL[@]} -gt 0 ]]; then
         EXT_NAME=$(echo "${QUERIED_EXT}" | jq -r '.["name"]')
       else
         # PK ID extension config fallback if specified
-        URL_QUERY=$(curl -s "https://extensions.gnome.org/extension-info/?pk=${UNINSTALL_EXT}")
+        URL_QUERY=$(curl -sf "https://extensions.gnome.org/extension-info/?pk=${UNINSTALL_EXT}")
         PK_EXT=$(echo "${URL_QUERY}" | jq -r '.["pk"]' 2>/dev/null)
         if [[ -z "${PK_EXT}" ]] || [[ "${PK_EXT}" == "null" ]]; then
           echo "ERROR: Extension with PK ID '${UNINSTALL_EXT}' does not exist in https://extensions.gnome.org/ website"

modules/rpm-ostree/rpm-ostree.sh

@@ -12,10 +12,19 @@ if [[ ${#REPOS[@]} -gt 0 ]]; then
         # If it's the COPR repo, then download the repo normally
         # If it's not, then download the repo with URL in it's filename, to avoid duplicate repo name issue
         if [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == "https://copr.fedorainfracloud.org/coprs/"* ]]; then
-          curl --output-dir "/etc/yum.repos.d/" -O "${REPO//[$'\t\r\n ']}"
+          REPO_URL="${REPO//[$'\t\r\n ']}"
+
+          echo "Downloading repo file ${REPO_URL}"
+          curl -fLs --create-dirs -O "${REPO_URL}" --output-dir "/etc/yum.repos.d/"
+          echo "Downloaded repo file ${REPO_URL}"
         elif [[ "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" != "https://copr.fedorainfracloud.org/coprs/"* ]]; then
-          CLEAN_REPO_NAME=$(echo "${REPO}" | sed 's/^https\?:\/\///')
-          curl -o "/etc/yum.repos.d/${CLEAN_REPO_NAME//\//.}" "${REPO//[$'\t\r\n ']}"
+          REPO_URL="${REPO//[$'\t\r\n ']}"
+          CLEAN_REPO_NAME=$(echo "${REPO_URL}" | sed 's/^https\?:\/\///')
+          CLEAN_REPO_NAME="${CLEAN_REPO_NAME//\//.}"
+
+          echo "Downloading repo file ${REPO_URL}"
+          curl -fLs --create-dirs "${REPO_URL}" -o "/etc/yum.repos.d/${CLEAN_REPO_NAME}"
+          echo "Downloaded repo file ${REPO_URL}"
         elif [[ ! "${REPO}" =~ ^https?:\/\/.* ]] && [[ "${REPO}" == *".repo" ]] && [[ -f "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" ]]; then
           cp "${CONFIG_DIRECTORY}/rpm-ostree/${REPO}" "/etc/yum.repos.d/${REPO##*/}"
         fi  
@@ -158,8 +167,13 @@ if [[ ${#REPLACE[@]} -gt 0 ]]; then
         echo "Replacing packages from COPR repository: '${REPO_NAME}' owned by '${MAINTAINER}'"
         echo "Replacing: ${REPLACE_STR}"
 
-        curl --output-dir "/etc/yum.repos.d/" -O "${REPO//[$'\t\r\n ']}"
-        rpm-ostree override replace --experimental --from repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME} ${REPLACE_STR}
+        REPO_URL="${REPO//[$'\t\r\n ']}"
+
+        echo "Downloading repo file ${REPO_URL}"
+        curl -fLs --create-dirs -O "${REPO_URL}" --output-dir "/etc/yum.repos.d/"
+        echo "Downloaded repo file ${REPO_URL}"
+
+        rpm-ostree override replace --experimental --from "repo=copr:copr.fedorainfracloud.org:${MAINTAINER}:${REPO_NAME}" ${REPLACE_STR}
         rm "/etc/yum.repos.d/${FILE_NAME}"
 
     done

modules/signing/signing.sh

@@ -38,7 +38,7 @@ yq -i -o=j '.transports.docker |=
     {"'"$IMAGE_REGISTRY"'/'"$IMAGE_NAME"'": [
             {
                 "type": "sigstoreSigned",
-                "keyPath": "/usr/etc/pki/containers/'"$IMAGE_NAME_FILE"'.pub",
+                "keyPath": "/etc/pki/containers/'"$IMAGE_NAME_FILE"'.pub",
                 "signedIdentity": {
                     "type": "matchRepository"
                 }

modules/yafti/yafti.sh

@@ -19,16 +19,19 @@ FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
 
 # Fetch ublue COPR
 REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
+REPO_URL="${REPO//[$'\t\r\n ']}"
 STAGING_REPO_PATH="/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo"
 BACKUP_STAGING_REPO_PATH="${STAGING_REPO_PATH}.backup"
 
 if [ -f "$STAGING_REPO_PATH" ]; then
     mv "$STAGING_REPO_PATH" "$BACKUP_STAGING_REPO_PATH"
 fi
 
-wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
+echo "Downloading repo file ${REPO_URL}"
+curl -fLs --create-dirs "${REPO_URL}" -o "${STAGING_REPO_PATH}"
+echo "Downloaded repo file ${REPO_URL}"
 
-rpm-ostree install yafti
+rpm-ostree install libadwaita yafti
 
 # Remove ublue COPR
 rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo