ghost92/i2pdbrowser-github
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add checks to linux builder

Browse Source 
Former-commit-id: dc534a55c0
This commit is contained in:
R4SAS 2017-02-26 21:49:43 +03:00
parent 01d7d908f8
commit 72a5f3da0e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
linux/build/i2pdbrowserportable.sh
View File

@ -11,7 +11,7 @@ language=$(echo $LANG | cut -c-5 | sed s/_/-/g)
version="45.7.0esr" version="45.7.0esr"
application="firefox" application="firefox"
curlfind=$(find /bin /usr/bin /usr/sbin /usr/local/bin -type f -name curl) curlfind=$(which curl)
if [ -z $curlfind ]; then if [ -z $curlfind ]; then
echo "Can't find cURL installed. That script needs it!"; echo "Can't find cURL installed. That script needs it!";
exit 1; exit 1;
@ -25,16 +25,24 @@ url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$lan
echo "Downloading $application..." echo "Downloading $application..."
curl -L -f -# -O $url curl -L -f -# -O $url
if [ $? -ne 0 ]; then # Not found error, trying to cut language variable if [ $? -ne 0 ]; then # Not found error, trying to cut language variable
echo "I'll try download Firefox with shortener language code"; echo "[TRY 2] I'll try download Firefox with shortener language code";
language=$(echo $language | cut -c-2) language=$(echo $language | cut -c-2)
# re-create variable with cutted lang # re-create variable with cutted lang
url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file" url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file"
curl -L -f -# -O $url curl -L -f -# -O $url
fi fi
if [ $? -ne 0 ]; then # Not found error, trying to download english version
echo "[TRY 3] I'll try download Firefox with English language code";
language="en_US"
# re-create variable with cutted lang
url="https://ftp.mozilla.org/pub/$application/releases/$version/linux-$arch/$language/$file"
curl -L -f -# -O $url
fi
if [ ! -f $file ]; then if [ ! -f $file ]; then
echo "Can't find downloaded file. Does FireFox support your system language?" echo "[Error] Can't find downloaded file. Check your internet connectivity."
exit 1; exit 1;
fi fi
echo "Extracting archive, please wait..." echo "Extracting archive, please wait..."
tar xfj $file tar xfj $file
rm $file rm $file

6
linux/i2pd/i2pd
View File

@ -8,6 +8,12 @@
arch=$(uname -m) arch=$(uname -m)
screenfind=$(which screen)
if [ -z $curlfind ]; then
echo "Can't find 'screen' installed. That script needs it!";
exit 1;
fi
if [ $arch == "x86_64" ] if [ $arch == "x86_64" ]
screen -Adm -S i2pd ./i2pd-x86_64 --datadir=. screen -Adm -S i2pd ./i2pd-x86_64 --datadir=.
else else