Merge branch '0.6-dev' of http://gitea.hatthieves.es/cloud/lch into 0.6-dev
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
VERSION=0.6r4
|
VERSION=0.6r5
|
||||||
DEST=$1
|
DEST=$1
|
||||||
shift 1
|
shift 1
|
||||||
ORIG=$@
|
ORIG=$@
|
||||||
|
|||||||
+8
-3
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
function rarInstall(){
|
function rarInstall(){
|
||||||
if [ -e "$(command -v wget)" ]
|
if [ -e "$(command -v wget)" ] || [ -e "$(command -v curl)" ]
|
||||||
then
|
then
|
||||||
if [[ "$(uname -m)" == "x86_64" ]]
|
if [[ "$(uname -m)" == "x86_64" ]]
|
||||||
then
|
then
|
||||||
@@ -11,7 +11,12 @@ function rarInstall(){
|
|||||||
RAR_URL="https://www.rarlab.com/rar/rarlinux-5.9.1.tar.gz"
|
RAR_URL="https://www.rarlab.com/rar/rarlinux-5.9.1.tar.gz"
|
||||||
RAR_FILE="rarlinux-5.9.1.tar.gz"
|
RAR_FILE="rarlinux-5.9.1.tar.gz"
|
||||||
fi
|
fi
|
||||||
wget -q $RAR_URL > /dev/null
|
if [ -e "$(command -v wget)" ]
|
||||||
|
then
|
||||||
|
wget -q $RAR_URL > /dev/null
|
||||||
|
else
|
||||||
|
curl -s -o $RAR_FILE $RAR_URL > /dev/null
|
||||||
|
fi
|
||||||
tar -zxvf $RAR_FILE > /dev/null
|
tar -zxvf $RAR_FILE > /dev/null
|
||||||
cd rar
|
cd rar
|
||||||
cp -v rar unrar /usr/local/bin/ > /dev/null
|
cp -v rar unrar /usr/local/bin/ > /dev/null
|
||||||
@@ -19,7 +24,7 @@ function rarInstall(){
|
|||||||
rm -r rar $RAR_FILE > /dev/null
|
rm -r rar $RAR_FILE > /dev/null
|
||||||
complete_install "rar"
|
complete_install "rar"
|
||||||
else
|
else
|
||||||
echo -e "\n\e[91m[Error]\e[0m - wget is not installed, so rar could not be installed.\nPlease install wget.\n"
|
echo -e "\n\e[91m[Error]\e[0m - wget or curl is not installed, so rar could not be installed.\nPlease install wget.\n"
|
||||||
read -p "Press [ENTER] to continue installing or [CTRL+C] to exit."
|
read -p "Press [ENTER] to continue installing or [CTRL+C] to exit."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# Functions
|
# Functions
|
||||||
|
|
||||||
function get_dep(){
|
function get_dep(){
|
||||||
if [[ $@ -ne "p7zip-plugins" ]]; then
|
if [[ $@ == "p7zip-plugins" ]]; then
|
||||||
yum install -y -q $@ 1> /dev/null
|
yum install -y -q $@ 1> /dev/null
|
||||||
else
|
else
|
||||||
yum install -y -q $@ 1> /dev/null
|
yum install -y -q $@ 1> /dev/null
|
||||||
|
|||||||
Reference in New Issue
Block a user