Merge pull request #78 from arakasi72/develop

Develop
This commit is contained in:
arakasi72
2015-09-26 00:39:44 +01:00
+16 -1
View File
@@ -19,7 +19,7 @@ install_rt=0
sshport=''
rudevflag=1
passfile='/etc/nginx/.htpasswd'
package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl cfv dtach htop irssi libcloog-ppl-dev libcppunit-dev libcurl3 libncurses5-dev libterm-readline-gnu-perl libsigc++-2.0-dev libperl-dev libtool libxml2-dev ncurses-base ncurses-term ntp patch pkg-config php5-fpm php5 php5-cli php5-dev php5-curl php5-geoip php5-mcrypt php5-xmlrpc python-scgi screen subversion texinfo unrar-free unzip zlib1g-dev libcurl4-openssl-dev mediainfo python-software-properties software-properties-common aptitude php5-json nginx-full apache2-utils git libarchive-zip-perl libnet-ssleay-perl libhtml-parser-perl libxml-libxml-perl libjson-perl libjson-xs-perl libxml-libxslt-perl libjson-rpc-perl libarchive-zip-perl"
package_list="sudo nano autoconf build-essential ca-certificates comerr-dev curl cfv dtach htop irssi libcloog-ppl-dev libcppunit-dev libcurl3 libncurses5-dev libterm-readline-gnu-perl libsigc++-2.0-dev libperl-dev libtool libxml2-dev ncurses-base ncurses-term ntp patch pkg-config php5-fpm php5 php5-cli php5-dev php5-curl php5-geoip php5-mcrypt php5-xmlrpc python-scgi screen subversion texinfo unzip zlib1g-dev libcurl4-openssl-dev mediainfo python-software-properties software-properties-common aptitude php5-json nginx-full apache2-utils git libarchive-zip-perl libnet-ssleay-perl libhtml-parser-perl libxml-libxml-perl libjson-perl libjson-xs-perl libxml-libxslt-perl libjson-rpc-perl libarchive-zip-perl"
Install_list=""
#exit on error function
@@ -233,6 +233,21 @@ for package_name in $package_list
test -z "$install_list" || apt-get -y install $install_list >> $logfile 2>&1
if [ "${FULLREL#*Debian*}" != "$FULLREL" ]; then
cd $home
if [ "$(uname -m)" = "x86_64" ]; then
curl -s http://www.rarlab.com/rar/rarlinux-x64-5.2.1.tar.gz | tar xz
elif [ "$(uname -m)" = "x86_32" ]; then
curl -s http://www.rarlab.com/rar/rarlinux-5.2.1.tar.gz | tar xz
fi
cp $home/rar/rar /bin/rar
cp $home/rar/unrar /bin/unrar
rm -r $home/rar
else
apt-get -y install unrar
fi
# if [ $RELNO = 14 ] && [ $(dpkg-query -W -f='${Status}' "ffmpeg-real" 2>/dev/null | grep -c "ok installed") = 0 ]; then
# apt-add-repository -y ppa:samrog131/ppa >> $logfile 2>&1 || error_exit "Problem adding to repository from - https://launchpad.net/~samrog131/+archive/ubuntu/ppa"
# apt-get update >> $logfile 2>&1 || error_exit "problem updating package lists"