Commit 02beb054 authored by Cyril 'kibi' Brulebois's avatar Cyril 'kibi' Brulebois
Browse files

Merge branch 'web/release-4.9' (Closes: #17833)

Conflicts:
	wiki/src/contribute/how/documentation/release_notes/template.mdwn
parents 1738cc3e 66fd7dfe
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -28,7 +28,7 @@ fi
### helper functions
fatal () {
echo "Fatal: $@" >&2
echo "Fatal: $*" >&2
exit 2
}
......@@ -56,7 +56,7 @@ export DEBEMAIL="${AMNESIA_DEV_EMAIL}"
echo "Updating debian/changelog from Git history..."
gbp dch \
`if [ ${SNAPSHOT} = yes ]; then echo '--snapshot --auto' ; fi` \
`if [ ${SNAPSHOT} = no -a -n ${SINCE} ]; then echo "--since=${SINCE}" ; fi` \
`if [ ${SNAPSHOT} = no -a -n "${SINCE}" ]; then echo "--since=${SINCE}" ; fi` \
`if [ ${SNAPSHOT} = no -a -z ${SINCE} ]; then echo "--auto" ; fi` \
--new-version="${NEW_VERSION}" \
--ignore-branch \
......
......@@ -25,7 +25,6 @@ ovmf
pry
python-jabberbot
python-potr
qemu-kvm
qemu-system-x86
redir
ruby-guestfs
......@@ -264,11 +263,11 @@ while [ $# -gt 0 ]; do
;;
--iso)
shift
export TAILS_ISO="$(readlink -f "$1")"
export TAILS_ISO="$(realpath -s "$1")"
;;
--old-iso)
shift
export OLD_TAILS_ISO="$(readlink -f "$1")"
export OLD_TAILS_ISO="$(realpath -s "$1")"
;;
--help)
usage
......
Subproject commit 28bdbfb67243b3ed0ff16c3694d1ac1ee51f5642
Subproject commit e81b1006a802bca117faa9b295a4b90332c7c47f
......@@ -82,7 +82,7 @@ Follow our installation instructions:
- [[Install from macOS|install/mac]]
- [[Install from Linux|install/linux]]
<div class="caution"><p>All the data on this USB stick will be lost if
<div class="caution"><p>The Persistent Storage on the USB stick will be lost if
you install instead of upgrading.</p></div>
## To download only
......
2020-06-28
\ No newline at end of file
2020-07-28
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment