1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix error detection for makedist and no color if writing to pipe or -yes is given

Browse Source
This commit is contained in:
Gnadelwartz 2018-02-01 17:24:55 +01:00
parent 47d6c50721
commit 5f25de59d0
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
update-from-repo.sh
View File

@ -5,7 +5,6 @@
#
# Version 1.4, 2018-01-31
#
#
# Kay Marquardt, kay@rrr.de, https://github.com/gandelwartz
#############################################################################
@ -25,17 +24,24 @@ TEMP=$WTEMP
[[ "$PROD" == "usermin" ]] && TEMP=$UTEMP
LTEMP="${DIR}/.~lang"
# predefined colors for echo -e
RED='\e[49;0;31;82m'
BLUE='\e[49;1;34;182m'
GREEN='\e[49;32;5;82m'
ORANGE='\e[49;0;33;82m'
PURPLE='\e[49;1;35;82m'
LGREY='\e[49;1;37;182m'
GREY='\e[1;30m'
CYAN='\e[36m'
NC='\e[0m'
# don't ask -y given
if [[ "$1" == "-y" || "$1" == "-yes" ]] ; then
ASK="NO"
shift
fi
# predefined colors for echo -e on terminal
if [[ -t 1 && ${ASK} == "YES" ]] ; then
RED='\e[49;0;31;82m'
BLUE='\e[49;1;34;182m'
GREEN='\e[49;32;5;82m'
ORANGE='\e[49;0;33;82m'
PURPLE='\e[49;1;35;82m'
LGREY='\e[49;1;37;182m'
GREY='\e[1;30m'
CYAN='\e[36m'
NC='\e[0m'
fi
# help requested output usage
if [[ "$1" == "-h" || "$1" == "--help" ]] ; then
@ -72,12 +78,6 @@ if [[ "${PROD}" != "webmin" && "${PROD}" != "usermin" ]] ; then
exit 1
fi
# don't ask -y given
if [[ "$1" == "-y" || "$1" == "-yes" ]] ; then
ASK="NO"
shift
fi
# need to be root
if [[ $EUID -ne 0 ]]; then
echo -e "${RED}Error: This command has to be run under the root user.${NC}"
@ -180,7 +180,7 @@ fi
cp authentic-theme/LICENSE ${TEMP}/authentic-theme
# run makedist.pl
( cd ${TEMP}; perl makedist.pl ${DOTVER} )
if [[ ! -f "${TARBALL}/webmin*.tar" ]] ; then
if [[ ! -f "${TEMP}/tarballs/webmin-${DOTVER}.tar.gz" ]] ; then
echo -e "${RED}Error: makedist.pl failed! ${NC}aborting ..."
rm -rf .~files
exit 5
@ -220,7 +220,7 @@ fi
# "compile" UTF-8 lang files
echo -en "\n${CYAN}compile UTF-8 lang files${NC} ..."
if [[ `which iconv 2> /dev/null` != '' ]] ; then
perl "${TEMP}/chinese-to-utf8.pl" . 2>&1 | while read input; do ((line++)); [ ${line} -eq 50 ] && { echo -n "." ; line=0;}; done
perl "${TEMP}/chinese-to-utf8.pl" . 2>&1 | while read input; do echo -n "."; done
else
echo -e "${BLUE} iconv not found, skipping lang files!${NC}"
fi