Skip to content

Commit dacce3e

Browse files
committed
build
1 parent 1422ba7 commit dacce3e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

usr/share/usability-misc/dist-installer-cli-standalone

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,7 +2062,7 @@ get_pattern_sources_debian() {
20622062
write_sources_debian() {
20632063
url="${1}"
20642064
file="${2}"
2065-
printf '%s' "${url}" | root_cmd tee -- "${file}" ||
2065+
printf '%s\n' "${url}" | root_cmd tee -- "${file}" ||
20662066
die 1 "${underline}Sources List Writer:${nounderline} Failed to write to file: '${file}'"
20672067
}
20682068

@@ -2554,9 +2554,9 @@ install_oracle_repository_fedora() {
25542554
if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle ]; then
25552555
log info "Oracle Repository: Key /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle already exists."
25562556
else
2557-
printf '%s' "${oracle_pgp}" | \
2557+
printf '%s\n' "${oracle_pgp}" | \
25582558
run_as_target_user tee -- "${log_dir_cur}/oracle-virtualbox-2016.asc" >/dev/null
2559-
printf '%s' "${oracle_pgp}" | \
2559+
printf '%s\n' "${oracle_pgp}" | \
25602560
root_cmd tee /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle >/dev/null
25612561
## Optional: the key will be imported when trying to use the repository
25622562
root_cmd rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
@@ -2592,9 +2592,9 @@ install_oracle_repository_debian() {
25922592
if [ -f /usr/share/keyrings/oracle.asc ]; then
25932593
log info "Oracle Repository: Key /usr/share/keyrings/oracle.asc already exists."
25942594
else
2595-
printf '%s' "${oracle_pgp}" | \
2595+
printf '%s\n' "${oracle_pgp}" | \
25962596
run_as_target_user tee -- "${log_dir_cur}/oracle-virtualbox-2016.asc" >/dev/null
2597-
printf '%s' "${oracle_pgp}" | \
2597+
printf '%s\n' "${oracle_pgp}" | \
25982598
root_cmd tee /usr/share/keyrings/oracle-virtualbox-2016.asc >/dev/null
25992599
fi
26002600
write_sources_debian "${oracle_url}" "${oracle_file_debsource}"
@@ -2646,7 +2646,7 @@ install_unstable_repository_debian() {
26462646

26472647
log notice "APT Preferences Configuration Writer: Adding APT pinning configuration to prefer testing over unstable."
26482648
file="/etc/apt/preferences.d/40-installer-dist-pinning"
2649-
printf '%s' "\
2649+
printf '%s\n' "\
26502650
## This file was created by: $0
26512651
## It can be safely deleted if you know what you are doing.
26522652
@@ -3850,7 +3850,9 @@ check_signature() {
38503850
log info "Signify key:\n${signify_key}"
38513851
log info "Verifying file: '${signify_checksum_file}'"
38523852
signify_pub_file="${log_dir_cur}/${signify_signer}.pub"
3853-
printf '%s' "${signify_key}" | run_as_target_user tee -- "${signify_pub_file}" >/dev/null
3853+
## Newline '\n' at the end needed. Otherwise error:
3854+
#signify-openbsd: missing new line after base64 in /home/user/dist-installer-cli-download/logs/1/adrelanos.pub
3855+
printf '%s\n' "${signify_key}" | run_as_target_user tee -- "${signify_pub_file}" >/dev/null
38543856

38553857
log_run info run_signify -V -p "${signify_pub_file}" \
38563858
-m "${signify_checksum_file}" || return 1

0 commit comments

Comments
 (0)