Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit a97cb71
Author: Uri Herrera <[email protected]>
Date:   Tue Jul 9 01:45:57 2024 -0600

    update pkg
  • Loading branch information
UriHerrera committed Jul 9, 2024
1 parent ecaf51f commit 67c8a12
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
nuts (2.1.5-2) nitrux; urgency=medium

* Rmeove leftovers after applying the upgrade.

-- Uri Herrera <[email protected]> Tue, 09 Jul 2024 01:45:00 -0500

nuts (2.1.5-1) nitrux; urgency=medium

* Rebuild the package.
Expand Down
1 change: 1 addition & 0 deletions tmp/nuts-ccu
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,7 @@ files=(
"/etc/NetworkManager/dnsmasq.d/02-dnscrypt-proxy.conf"
"/etc/NetworkManager/dnsmasq.d/03-dnssec.conf"
"/etc/dnsmasq.d/dns-block.conf"
"/etc/resolvconf.conf"
)

for file in "${files[@]}"; do
Expand Down
7 changes: 3 additions & 4 deletions tmp/nuts-cru
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ puts_success "Success! Backup has been created."


# -- Download the OTA SquashFS with axel if it doesn't exist. Use the list of mirrors from the query file, or exit if downloading the file from all mirrors fails.
# -- If the OTA file exist but it doesn't match the checksum in nuts-query.info, delete it and exit.

OTA_FILE="$NUTS_DIR_DLS/nuts-ota.squashfs"

Expand Down Expand Up @@ -327,7 +326,7 @@ fi


# -- Verify the checksum of the OTA file. Use the checksum from the query file.
# -- Exit if checksum doesn't match.
# -- If the OTA file exist but it doesn't match the checksum in nuts-query.info, delete it and exit.

LOCAL_OTA_SUM=$(md5sum "$NUTS_DIR_DLS"/nuts-ota.squashfs | awk '{ print $1 }')
NQ_OTA_SUM=$(grep -oP '(?<=OTASUM=)[a-f0-9]{32}' /tmp/nuts-query.info)
Expand Down Expand Up @@ -362,7 +361,7 @@ VAR_DATA_URL="https://raw.githubusercontent.com/Nitrux/storage/master/Other/var-
TARFILE_DL_PATH="/tmp/var-lib-dpkg-$VAR_DATA_TARGET.tar.xz"

if [[ -f "$AIPKG_MANAGER" ]]; then
puts_info "$AIPKG_MANAGER already exists, skipping download."
puts_info "AppImage already exists, skipping download."
else
if dl_file "$APPIMAGE_URL" > "$AIFILE_DL_PATH" && \
[[ $(file --mime-type -b "$AIFILE_DL_PATH") == "application/x-executable" ]] && \
Expand Down Expand Up @@ -405,7 +404,7 @@ fi

puts_success "Success! OTA update process completed successfully, continuing..."

[[ -f "$AIPKG_MANAGER" ]] && rm "$AIPKG_MANAGER"
[[ -f "$AIPKG_MANAGER" ]] && rm "$AIPKG_MANAGER" && /usr/bin/dpkg


# -- Clean up the updated root after updating.
Expand Down

0 comments on commit 67c8a12

Please sign in to comment.