Skip to content

Commit bbfd907

Browse files
authored
Bash enviorment fix
1 parent 4b5ca34 commit bbfd907

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

arx_downloader

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#### Author: Osguot ####
55
########################
66

7-
VERSION="4.0.0"
7+
VERSION="4.0.1"
88

99
## This file contain information about install directory and type of installation
1010
arx_downloader_conf_file="/home/$USER/.config/arx_downloader.conf"
@@ -144,7 +144,7 @@ function libertatisDownload () {
144144
toConfFile "TYPE=OnlyLibertatis" "INSTALL_DIR=$install_folder"
145145

146146
## Check latest version
147-
getLatestLibertatisVersion | zenity --progress --width=300 --pulsate --cancel-label="$_cancelLabel" --title="$_funMain_title" --text="$_funLD_text2" --auto-close
147+
#getLatestLibertatisVersion | zenity --progress --width=300 --pulsate --cancel-label="$_cancelLabel" --title="$_funMain_title" --text="$_funLD_text2" --auto-close
148148

149149
## Choosing Libertatis version dialog, downloading, unpacking and installing
150150
ver=$(zenity --list --width=480 --cancel-label="$_exitLabel" --ok-label="$_nextLabel" --title "$_funMain_title" --text="$_funLD_text3" --radiolist --column="" --column="$_funLD_column2" TRUE "$_funLD_latestStableOption" FALSE "$_funLD_latestDevOption")
@@ -198,20 +198,20 @@ function libertatisDownload () {
198198
function getLatestLibertatisVersion () {
199199

200200
## Detecting latest stable version of Arx Libertatis from arx-libertatis.org
201-
declare -g latestStableVer=$(wget -O- http://arx-libertatis.org/files/ | grep -Eo 'arx-libertatis-[[:digit:]]{1}.[[:digit:]]{1}.[[:digit:]]{1}' | sort -V | tail -1)
201+
latestStableVer=$(wget -O- http://arx-libertatis.org/files/ | grep -Eo 'arx-libertatis-[[:digit:]]{1}.[[:digit:]]{1}.[[:digit:]]{1}' | sort -V | tail -1)
202202
## Detecting latest dev version of Arx Libertatis from arx-libertatis.org
203-
declare -g latestVer=$(wget -O- http://arx-libertatis.org/files/snapshots/ | grep -Eo 'arx-libertatis-1.2-dev-[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}' | sort -V | tail -1)
203+
latestVer=$(wget -O- http://arx-libertatis.org/files/snapshots/ | grep -Eo 'arx-libertatis-1.2-dev-[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}' | sort -V | tail -1)
204204

205205
## Set file name and url for the latest stable Arx Libertatis version
206-
declare -g latestStableLinuxVerFile=$latestStableVer"-linux.tar.xz"
207-
declare -g latestStableLinuxVerURL="http://arx-libertatis.org/files/$latestStableVer/$latestStableLinuxVerFile"
206+
latestStableLinuxVerFile=$latestStableVer"-linux.tar.xz"
207+
latestStableLinuxVerURL="http://arx-libertatis.org/files/$latestStableVer/$latestStableLinuxVerFile"
208208
## Set file name and url for the latest Arx Libertatis version
209-
declare -g latestLinuxVerFile=$latestVer"-linux.tar.xz"
210-
declare -g latestLinuxVerURL="http://arx-libertatis.org/files/snapshots/$latestVer/$latestLinuxVerFile"
209+
latestLinuxVerFile=$latestVer"-linux.tar.xz"
210+
latestLinuxVerURL="http://arx-libertatis.org/files/snapshots/$latestVer/$latestLinuxVerFile"
211211

212212
## "short-version" variables
213-
declare -g latestStableVerShort=$(echo $latestStableVer | cut -c 16-)
214-
declare -g latestVerShort=$(echo $latestVer | cut -c 16-)
213+
latestStableVerShort=$(echo $latestStableVer | cut -c 16-)
214+
latestVerShort=$(echo $latestVer | cut -c 16-)
215215
}
216216

217217
function libertatisVersionChecker () {
@@ -259,7 +259,7 @@ function libertatisVersionChecker () {
259259
fi
260260

261261
## Call getLatestLibertatisVersion function
262-
getLatestLibertatisVersion | zenity --progress --width=300 --pulsate --cancel-label="$_cancelLabel" --title="$_funLU_title" --text="$_funLU_text5" --auto-close
262+
#getLatestLibertatisVersion | zenity --progress --width=300 --pulsate --cancel-label="$_cancelLabel" --title="$_funLU_title" --text="$_funLU_text5" --auto-close
263263

264264
## arx-libertatis-1.2-dev-YYYY-MM-DD --> YYYY-MM-DD
265265
latest=$(echo $latestVer | grep -Eo '[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}')
@@ -548,6 +548,7 @@ function main () {
548548
fi
549549
}
550550

551+
getLatestLibertatisVersion
551552
initialCheck
552553
scriptUpdate
553554
main

0 commit comments

Comments
 (0)