Update install.sh
This commit is contained in:
parent
ee957f1574
commit
c015ef90eb
1 changed files with 2 additions and 6 deletions
|
|
@ -298,14 +298,12 @@ downloadImage() {
|
||||||
|
|
||||||
local iso="$1"
|
local iso="$1"
|
||||||
local url="$2"
|
local url="$2"
|
||||||
local file="$iso"
|
|
||||||
local desc rc progress
|
local desc rc progress
|
||||||
|
|
||||||
rm -f "$iso"
|
rm -f "$iso"
|
||||||
|
|
||||||
if [[ "$EXTERNAL" != [Yy1]* ]]; then
|
if [[ "$EXTERNAL" != [Yy1]* ]]; then
|
||||||
|
|
||||||
file="$iso"
|
|
||||||
desc=$(printVersion "$VERSION")
|
desc=$(printVersion "$VERSION")
|
||||||
[ -z "$desc" ] && desc="Windows"
|
[ -z "$desc" ] && desc="Windows"
|
||||||
|
|
||||||
|
|
@ -318,9 +316,7 @@ downloadImage() {
|
||||||
|
|
||||||
if [[ "$EXTERNAL" != [Yy1]* ]]; then
|
if [[ "$EXTERNAL" != [Yy1]* ]]; then
|
||||||
|
|
||||||
rm -f "$file"
|
if ! getESD "$TMP/esd" "$iso"; then
|
||||||
|
|
||||||
if ! getESD "$TMP/esd" "$file"; then
|
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -331,7 +327,7 @@ downloadImage() {
|
||||||
local msg="Downloading $desc..."
|
local msg="Downloading $desc..."
|
||||||
info "$msg" && html "$msg"
|
info "$msg" && html "$msg"
|
||||||
|
|
||||||
/run/progress.sh "$file" "Downloading $desc ([P])..." &
|
/run/progress.sh "$iso" "Downloading $desc ([P])..." &
|
||||||
|
|
||||||
# Check if running with interactive TTY or redirected to docker log
|
# Check if running with interactive TTY or redirected to docker log
|
||||||
if [ -t 1 ]; then
|
if [ -t 1 ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue