root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Merge branch 'patch-php-redirector' into 'master'

Browse source 
php redirector to download latest iso

See merge request tools/development-tools/manjaro-tools!307
This commit is contained in:
Stefano Capitani 2020-02-08 17:51:14 +01:00
commit 05722a2fa2
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -233,6 +233,12 @@ gen_latest_html(){
html_doc+="<title>Download Redirection</title>" 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>" 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" echo ${html_doc} > "${iso_dir}/.latest"
php_doc="<?php "
php_doc+="header('Location: ' . '${direct_url}', true, 303); "
php_doc+="die(); "
php_doc+="?>"
echo ${php_doc} > "${iso_dir}/.latest.php"
fi fi
fi fi
} }

14
lib/util-publish.sh
View file

@ -80,7 +80,7 @@ sync_dir(){
msg "Start upload [%s] to [%s] ..." "$1" "${project}" msg "Start upload [%s] to [%s] ..." "$1" "${project}"
while [[ $count -le $max_count ]]; do while [[ $count -le $max_count ]]; do
rsync ${rsync_args[*]} --exclude '.latest' ${src_dir}/ ${server}/${target_dir}/ rsync ${rsync_args[*]} --exclude '.latest*' ${src_dir}/ ${server}/${target_dir}/
if [[ $? != 0 ]]; then if [[ $? != 0 ]]; then
count=$(($count + 1)) count=$(($count + 1))
msg "Upload failed. retrying (%s/%s) ..." "$count" "$max_count" msg "Upload failed. retrying (%s/%s) ..." "$count" "$max_count"
@ -88,6 +88,7 @@ sync_dir(){
else else
count=$(($max_count + 1)) count=$(($max_count + 1))
[[ -f "${src_dir}/.latest" ]] && sync_latest_html [[ -f "${src_dir}/.latest" ]] && sync_latest_html
[[ -f "${src_dir}/.latest.php" ]] && sync_latest_php
msg "Done upload [%s]" "$1" msg "Done upload [%s]" "$1"
show_elapsed_time "${FUNCNAME}" "${timer_start}" show_elapsed_time "${FUNCNAME}" "${timer_start}"
fi fi
@ -96,10 +97,19 @@ sync_dir(){
} }
sync_latest_html(){ sync_latest_html(){
msg2 "Sending download link ..." msg2 "Uploading url redirector ..."
local webserver=$(connect_webserver) local webserver=$(connect_webserver)
local htdocs="htdocs/${profile}" local htdocs="htdocs/${profile}"
local html="latest" local html="latest"
scp "${src_dir}/.${html}" "${webserver}/${htdocs}/${html}" scp "${src_dir}/.${html}" "${webserver}/${htdocs}/${html}"
rm -f "${src_dir}/.${html}" rm -f "${src_dir}/.${html}"
} }
sync_latest_php(){
msg2 "Uploading php redirector ..."
local webserver=$(connect_webserver)
local htdocs="htdocs/${profile}"
local php="latest.php"
scp "${src_dir}/.${php}" "${webserver}/${htdocs}/${php}"
rm -f "${src_dir}/.${php}"
}