From 39ad32ff2226884613cd84babe2370f5c7cac71c Mon Sep 17 00:00:00 2001 From: gumi Date: Sun, 21 Jan 2018 18:11:02 -0500 Subject: optimize make-updates for CI --- client/make-updates.sh | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/client/make-updates.sh b/client/make-updates.sh index 26b7d60..fd5de5c 100755 --- a/client/make-updates.sh +++ b/client/make-updates.sh @@ -4,12 +4,9 @@ # Author: Andrei Karas (4144), gumi dir=`pwd` -output=~/www/updates +UPDATE_DIR=${UPDATE_DIR:=~/www/updates} cdata=../../client-data -http_root="http://updates.themanaworld.org/updates" - -LDLIBS=-lz -prefix=/usr/local +UPDATE_HTTP=${UPDATE_HTTP:="http://updates.themanaworld.org/updates"} CC=${CC:=gcc} function check_update() { @@ -49,15 +46,15 @@ $CC -lz adler32.c -o adler32 echo -e "\e[96m>> Creating directory tree...\e[0m" mkdir -pv files -mkdir -pv $output +mkdir -pv $UPDATE_DIR mkdir -pv $cdata/music echo -e "\e[96m>> Removing leftovers...\e[0m" rm -rv files/* 2>/dev/null || : -rm -v $output/Legacy.zip 2>/dev/null || : -rm -v $output/Legacy-music.zip 2>/dev/null || : -rm -v $output/resources.xml 2>/dev/null || : -rm -v $output/resources2.txt 2>/dev/null || : # Legacy: used by mana client +rm -v $UPDATE_DIR/Legacy.zip 2>/dev/null || : +rm -v $UPDATE_DIR/Legacy-music.zip 2>/dev/null || : +rm -v $UPDATE_DIR/resources.xml 2>/dev/null || : +rm -v $UPDATE_DIR/resources2.txt 2>/dev/null || : # Legacy: used by mana client echo -e "\e[96m>> Entering client-data...\e[0m" pushd $cdata &>/dev/null @@ -79,22 +76,24 @@ echo "" >>resources.xml echo -e "\e[96m>> Moving stuff around...\e[0m" -cp -v Legacy.zip $output/ -cp -v Legacy-music.zip $output/ -cp -v resources.xml $output/ +cp -v Legacy.zip $UPDATE_DIR/ +cp -v Legacy-music.zip $UPDATE_DIR/ +cp -v resources.xml $UPDATE_DIR/ echo -e "\e[96m>> Giving read permissions...\e[0m" -pushd $output &>/dev/null +pushd $UPDATE_DIR &>/dev/null chmod a+r Legacy.zip chmod a+r Legacy-music.zip chmod a+r resources.xml -echo -echo -e "\e[96m>> Checking updates...\e[0m" -check_update "$http_root/Legacy.zip" -check_update "$http_root/Legacy-music.zip" -check_update "$http_root/resources.xml" -check_update "$http_root/news.php" +if [ "$UPDATE_HTTP" != "none" ] ; then + echo + echo -e "\e[96m>> Checking updates...\e[0m" + check_update "$UPDATE_HTTP/Legacy.zip" + check_update "$UPDATE_HTTP/Legacy-music.zip" + check_update "$UPDATE_HTTP/resources.xml" + check_update "$UPDATE_HTTP/news.php" +fi popd &>/dev/null # $dir/files popd &>/dev/null # $cdata -- cgit v1.2.3-60-g2f50