root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed limitation on which latest to build

Browse source 
buildiso -l - create permalink for iso
deployiso -z - create and upload permalinks
This commit is contained in:
Frede Hundewadt 2020-02-29 10:59:50 +01:00
parent ca5034d06e
commit 4180b449cb
No known key found for this signature in database
GPG key ID: 7605992471F3F073
5 changed files with 101 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -69,7 +69,7 @@ overriding
# log_dir='/var/log/manjaro-tools'
# custom build mirror server
# build_mirror=https://mirror.netzspielplatz.de/manjaro/packages
# build_mirror=https://manjaro.moson.eu
################ buildtree ###############
@ -95,13 +95,13 @@ overriding
# build_list_iso=default
# the dist release; default: auto
# dist_release=17.1
# dist_release=auto
# the branding; default: auto
# dist_branding="MJRO"
# dist_branding="MANJARO"
# unset defaults to given value
# kernel="linux414"
# kernel="linux54"
# gpg key; leave empty or commented to skip sfs signing
# gpgkey=""
@ -240,6 +240,7 @@ Usage: buildiso [options]
-h This help
-k <name> Kernel to use
[default: linux49]
-l Create permalink
-m Set SquashFS image mode to persistence
-p <profile> Buildset or profile [default: default]
-q Query settings and pretend build
@ -405,6 +406,7 @@ Usage: deployiso [options]
-t Create ISO torrent
-u Update remote directory
-v Verbose output
-z Upload permalinks (shell.osdn.net)
~~~
###### * upload official build list, ie all built iso defined in a build list

34
bin/buildiso.in
View file

@ -29,6 +29,7 @@ show_profile(){
[[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
msg2 "extra: %s" "${extra}"
msg2 "permalink: %s" "${permalink}"
msg2 "netinstall: %s" "${netinstall}"
msg2 "chrootcfg: %s" "${chrootcfg}"
@ -78,6 +79,8 @@ display_settings(){
msg2 "images_only: %s" "${images_only}"
msg2 "iso_only: %s" "${iso_only}"
msg2 "persist: %s" "${persist}"
msg2 "extra: %s" "${full_iso}"
msg2 "permalink: %s" "${permalink}"
msg "DIST SETTINGS:"
msg2 "dist_name: %s" "${dist_name}"
@ -107,31 +110,33 @@ iso_only=false
verbose=false
persist=false
initialize=false
permalink=false
usage() {
echo "Usage: ${0##*/} [options]"
echo " -i Initialize iso-profiles repo [default: ${branch}]"
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
echo " -a <arch> Arch [default: ${target_arch}]"
echo " -b <branch> Branch [default: ${target_branch}]"
echo ' -c Disable clean work dir'
echo ' -d <comp> Compression used for build ISO: gzip, lzma, lz4, lzo, xz, zstd'
echo " [default: ${iso_compression}]"
echo ' -f Build full ISO (extra=true)'
echo ' -g <key> The gpg key for sfs signing'
echo " [default: ${gpgkey}]"
echo " -i Initialize iso-profiles repo [default: ${branch}]"
echo ' -k <name> Kernel to use'
echo " [default: ${kernel}]"
echo ' -l Create permalink'
echo ' -m Set SquashFS image mode to persistence'
echo " -p <profile> Buildset or profile [default: ${build_list_iso}]"
echo ' -q Query settings and pretend build'
echo ' -r <dir> Chroots directory'
echo " [default: ${chroots_iso}]"
echo ' -t <dir> Target directory'
echo " [default: ${cache_dir_iso}]"
echo ' -k <name> Kernel to use'
echo " [default: ${kernel}]"
echo ' -g <key> The gpg key for sfs signing'
echo " [default: ${gpgkey}]"
echo ' -m Set SquashFS image mode to persistence'
echo ' -c Disable clean work dir'
echo ' -f Build full ISO (extra=true)'
echo ' -d <comp> Compression used for build ISO: gzip, lzma, lz4, lzo, xz, zstd'
echo " [default: ${iso_compression}]"
echo ' -v Verbose output to log file, show profile detail (-q)'
echo ' -x Build images only'
echo ' -z Generate iso only'
echo ' Requires pre built images (-x)'
echo ' -v Verbose output to log file, show profile detail (-q)'
echo ' -q Query settings and pretend build'
echo ' -h This help'
echo ''
echo ''
@ -140,7 +145,7 @@ usage() {
orig_argv=("$@")
opts='p:a:b:r:t:k:g:d:cfzxmvqhi'
opts='p:a:b:r:t:k:g:d:cfzxmvqhil'
while getopts "${opts}" arg; do
case "${arg}" in
@ -160,6 +165,7 @@ while getopts "${opts}" arg; do
v) verbose=true ;;
x) images_only=true ;;
z) iso_only=true ;;
l) permalink=true ;;
h|?) usage 0 ;;
*) echo "invalid argument '${arg}'"; usage 1 ;;
esac

6
bin/deployiso.in
View file

@ -45,6 +45,7 @@ display_settings(){
msg2 "verbose: %s" "${verbose}"
msg2 "signiso: %s" "${sign}"
msg2 "torrent: %s" "${torrent}"
msg2 "shell_upload: %s" "${shell_upload}"
if ${torrent}; then
msg2 "tracker_url: %s" "${tracker_url}"
@ -75,6 +76,7 @@ update=false
verbose=false
sign=false
alt_storage=false
shell_upload=false
rsync_args=(-aP -e ssh)
@ -90,12 +92,13 @@ usage() {
echo ' -t Create ISO torrent'
echo ' -u Update remote directory'
echo ' -v Verbose output'
echo ' -z Upload permalinks (shell.osdn.net)'
echo ''
echo ''
exit $1
}
opts='adhl:p:qstuv'
opts='adhl:p:qstuvz'
while getopts "${opts}" arg; do
case "${arg}" in
@ -108,6 +111,7 @@ while getopts "${opts}" arg; do
t) torrent=true ;;
u) update=true; rsync_args+=(-u) ;;
v) verbose=true; rsync_args+=(-v --stats) ;;
z) shell_upload=true ;;
h|?) usage 0 ;;
*) echo "invalid argument '${arg}'"; usage 1 ;;
esac

37
lib/util-iso.sh
View file

@ -215,31 +215,38 @@ make_iso() {
fi
assemble_iso
[[ ${target_branch} == "stable" ]] && [[ ${extra} == "true" ]] && gen_latest_html
${permalink} && gen_permalink
msg "Done [Build ISO]"
}
gen_latest_html(){
gen_permalink(){
if [[ ${edition} == "community" ]] || [[ ${edition} == "manjaro" ]]; then
if [[ -f "${iso_dir}/${iso_file}" ]]; then
msg2 "Creating download link ..."
if [[ -f "${iso_dir}/${iso_file}" ]]; then
msg2 "Creating download link ..."
direct_url="https://osdn.net/dl/${edition}/${iso_file}"
[[ ${edition} == "community" ]] && direct_url="https://osdn.net/dl/manjaro-${edition}/${iso_file}"
html_doc="<!DOCTYPE HTML>"
html_doc+="<meta charset=\"UTF-8\">"
html_doc+="<meta http-equiv=\"refresh\" content=\"1; url=${direct_url}\">"
html_doc+="<script>window.location.href=\"${direct_url}\"</script>"
html_doc+="<title>Download Redirection</title>"
html_doc+="If you are not redirected automatically, follow the <a href=\"${direct_url}\">link to latest iso</a>"
echo ${html_doc} > "${iso_dir}/.latest"
[[ ${edition} == "community" ]] && direct_url="https://osdn.net/dl/manjaro-${edition}/${iso_file}"
## html permalink
html_doc="<!DOCTYPE HTML>"
html_doc+="<meta charset=\"UTF-8\">"
html_doc+="<meta http-equiv=\"refresh\" content=\"1; url=${direct_url}\">"
html_doc+="<script>window.location.href=\"${direct_url}\"</script>"
html_doc+="<title>Download Redirection</title>"
html_doc+="If you are not redirected automatically, follow the <a href=\"${direct_url}\">link to latest iso</a>"
## php permalink
php_doc="<?php "
php_doc+="header('Location: ' . '${direct_url}', true, 303); "
php_doc+="die(); "
php_doc+="?>"
echo ${php_doc} > "${iso_dir}/.latest.php"
fi
## write files
if [[ ${extra} == "true" ]]; then
echo ${html_doc} > "${iso_dir}/.latest"
echo ${php_doc} > "${iso_dir}/.latest.php"
else
echo ${html_doc} > "${iso_dir}/.latest-minimal"
echo ${php_doc} > "${iso_dir}/.latest-minimal.php"
fi
fi
fi
}

61
lib/util-publish.sh
View file

@ -9,6 +9,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
local MINIMAL
connect(){
${alt_storage} && server="storage-in" || server="storage"
local storage="@${server}.osdn.net:/storage/groups/m/ma/"
@ -92,10 +94,7 @@ sync_dir(){
else
count=$(($max_count + 1))
# sync latest files
# manjaro.osdn.io
# manjaro-community.osdn.io
sync_web_shell
${shell_upload} && upload_permalinks
msg "Done upload [%s]" "$1"
show_elapsed_time "${FUNCNAME}" "${timer_start}"
@ -104,35 +103,65 @@ sync_dir(){
}
sync_web_shell(){
upload_permalinks(){
## permalinks for full ISO
if [[ -f "${src_dir}/.latest" ]]; then
LINKS="links.txt"
msg "Uploading permalinks ..."
LATEST_ISO=$(sed -e 's/\"/\n/g' < "${src_dir}/.latest" | grep -Eo 'http.*iso$' -m1 | awk '{split($0,x,"/"); print x[6]}')
PKGLIST="${LATEST_ISO/.iso/-pkgs.txt}"
## upload redirector files
[[ -f "${src_dir}/.latest" ]] && sync_latest_html
[[ -f "${src_dir}/.latest.php" ]] && sync_latest_php
## upload verification files, torrent and package list
[[ -f "${src_dir}/${LATEST_ISO}.torrent" ]] && sync_latest_torrent
[[ -f "${src_dir}/${LATEST_ISO}.sig" ]] && sync_latest_signature
[[ -f "${src_dir}/${LATEST_ISO}.sha1" ]] && sync_latest_checksum_sha1
[[ -f "${src_dir}/${LATEST_ISO}.sha256" ]] && sync_latest_checksum_sha256
[[ -f "${src_dir}/${PKGLIST}" ]] && sync_latest_pkg_list
#sync_latest_index
## remove uploaded files
rm -f "${src_dir}/latest"
rm -f "${src_dir}/latest.php"
rm -f "${src_dir}/*.iso.torrent"
rm -f "${src_dir}/*.iso.sig"
rm -f "${src_dir}/*.iso.sha1"
rm -f "${src_dir}/*.iso.sha256"
rm -f "${src_dir}/${LATEST_ISO}.torrent"
rm -f "${src_dir}/${LATEST_ISO}.sig"
rm -f "${src_dir}/${LATEST_ISO}.sha1"
rm -f "${src_dir}/${LATEST_ISO}.sha256"
fi
## permalinks for minimal ISO
if [[ -f "${src_dir}/.latest-minimal" ]]; then
msg "Uploading permalinks (minimal) ..."
MINIMAL="yes"
LATEST_ISO=$(sed -e 's/\"/\n/g' < "${src_dir}/.latest-minimal" | grep -Eo 'http.*iso$' -m1 | awk '{split($0,x,"/"); print x[6]}')
PKGLIST="${LATEST_ISO/.iso/-pkgs.txt}"
## upload redirector files
[[ -f "${src_dir}/.latest-minimal" ]] && sync_latest_html
[[ -f "${src_dir}/.latest-minimal.php" ]] && sync_latest_php
## upload verification files, torrent and package list
[[ -f "${src_dir}/${LATEST_ISO}.torrent" ]] && sync_latest_torrent
[[ -f "${src_dir}/${LATEST_ISO}.sig" ]] && sync_latest_signature
[[ -f "${src_dir}/${LATEST_ISO}.sha1" ]] && sync_latest_checksum_sha1
[[ -f "${src_dir}/${LATEST_ISO}.sha256" ]] && sync_latest_checksum_sha256
[[ -f "${src_dir}/${PKGLIST}" ]] && sync_latest_pkg_list
## remove uploaded files
rm -f "${src_dir}/latest-minimal"
rm -f "${src_dir}/latest-minimal.php"
rm -f "${src_dir}/${LATEST_ISO}.torrent"
rm -f "${src_dir}/${LATEST_ISO}.sig"
rm -f "${src_dir}/${LATEST_ISO}.sha1"
rm -f "${src_dir}/${LATEST_ISO}.sha256"
fi
}
sync_latest_pkg_list(){
msg2 "Uploading package list ..."
local pkglist="latest-pkgs.txt"
[[ ${MINIMAL} == "yes" ]] && pkglist="latest-minimal-pkgs.txt"
scp "${src_dir}/${PKGLIST}" "${webshell}/${htdocs}/${pkglist}"
}
@ -140,6 +169,7 @@ sync_latest_checksum_sha256(){
msg2 "Uploading sha256 checksum file ..."
local filename="${LATEST_ISO}.sha256"
local checksum_file="latest.sha256"
[[ ${MINIMAL} == "yes" ]] && checksum_file="latest-minimal.sha256"
scp "${src_dir}/${filename}" "${webshell}/${htdocs}/${checksum_file}"
}
@ -147,6 +177,7 @@ sync_latest_checksum_sha1(){
msg2 "Uploading sha1 checksum file ..."
local filename="${LATEST_ISO}.sha1"
local checksum_file="latest.sha1"
[[ ${MINIMAL} == "yes" ]] && checksum_file="latest-minimal.sha1"
scp "${src_dir}/${filename}" "${webshell}/${htdocs}/${checksum_file}"
}
@ -154,6 +185,7 @@ sync_latest_signature(){
msg2 "Uploading signature file ..."
local filename="${LATEST_ISO}.sig"
local signature="latest.sig"
[[ ${MINIMAL} == "yes" ]] && signature="latest-minimal.sig"
scp "${src_dir}/${filename}" "${webshell}/${htdocs}/${signature}"
}
@ -161,17 +193,20 @@ sync_latest_torrent(){
msg2 "Uploading torrent file ..."
local filename="${LATEST_ISO}.torrent"
local torrent="latest.torrent"
[[ ${MINIMAL} == "yes" ]] && torrent="latest-minimal.torrent"
scp "${src_dir}/${filename}" "${webshell}/${htdocs}/${torrent}"
}
sync_latest_php(){
msg2 "Uploading php redirector ..."
local php="latest.php"
[[ ${MINIMAL} == "yes" ]] && php="latest-minimal.php"
scp "${src_dir}/.${php}" "${webshell}/${htdocs}/${php}"
}
sync_latest_html(){
msg2 "Uploading url redirector ..."
local html="latest"
scp "${src_dir}/.latest" "${webshell}/${htdocs}/${html}"
[[ ${MINIMAL} == "yes" ]] && html="latest-minimal"
scp "${src_dir}/.${html}" "${webshell}/${htdocs}/${html}"
}