Skip to content

Commit 7bbb3e1

Browse files
committed
Remove sudo as EasyEngine always run with root or sudo priviledge so no need to sudo in every command
1 parent fc2b754 commit 7bbb3e1

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

install.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ if [ ! -x /usr/bin/tee ]
4949
then
5050
echo -e "\033[31mTee Command Not Found\e[0m"
5151
echo -e "\033[34mInstalling Tee, Please Wait...\e[0m"
52-
sudo apt-get -y install coreutils &>> $INSTALLLOG || OwnError "Unable to install tee"
52+
apt-get -y install coreutils &>> $INSTALLLOG || OwnError "Unable to install tee"
5353
fi
5454

5555
echo &>> $INSTALLLOG
@@ -62,39 +62,39 @@ if [ ! -x /bin/ed ]
6262
then
6363
echo -e "\033[31mEd Command Not Found\e[0m" | tee -ai $INSTALLLOG
6464
echo -e "\033[34mInstalling Ed, Please Wait...\e[0m" | tee -ai $INSTALLLOG
65-
sudo apt-get -y install ed &>> $INSTALLLOG || OwnError "Unable to install ed"
65+
apt-get -y install ed &>> $INSTALLLOG || OwnError "Unable to install ed"
6666
fi
6767

6868
# Checking Wget
6969
if [ ! -x /usr/bin/wget ]
7070
then
7171
echo -e "\033[31mWget Command Not Found\e[0m" | tee -ai $INSTALLLOG
7272
echo -e "\033[34mInstalling Wget, Please Wait...\e[0m" | tee -ai $INSTALLLOG
73-
sudo apt-get -y install wget &>> $INSTALLLOG || OwnError "Unable To Install Wget"
73+
apt-get -y install wget &>> $INSTALLLOG || OwnError "Unable To Install Wget"
7474
fi
7575

7676
# Checking Curl
7777
if [ ! -x /usr/bin/curl ]
7878
then
7979
echo -e "\033[31mCurl Command Not Found\e[0m" | tee -ai $INSTALLLOG
8080
echo -e "\033[34mInstalling Curl, Please Wait...\e[0m" | tee -ai $INSTALLLOG
81-
sudo apt-get -y install curl &>> $INSTALLLOG || OwnError "Unable To Install Curl"
81+
apt-get -y install curl &>> $INSTALLLOG || OwnError "Unable To Install Curl"
8282
fi
8383

8484
# Checking Tar
8585
if [ ! -x /bin/tar ]
8686
then
8787
echo -e "\033[31mTar Command Not Found\e[0m" | tee -ai $INSTALLLOG
8888
echo -e "\033[34mInstalling Tar, Please Wait...\e[0m" | tee -ai $INSTALLLOG
89-
sudo apt-get -y install tar &>> $INSTALLLOG || OwnError "Unable To Install Tar"
89+
apt-get -y install tar &>> $INSTALLLOG || OwnError "Unable To Install Tar"
9090
fi
9191

9292
# Checking Git
9393
if [ ! -x /usr/bin/git ]
9494
then
9595
echo -e "\033[31mGit Command Not Found\e[0m" | tee -ai $INSTALLLOG
9696
echo -e "\033[34mInstalling Git, Please Wait...\e[0m" | tee -ai $INSTALLLOG
97-
sudo apt-get -y install git-core &>> $INSTALLLOG || OwnError "Unable To Install Git"
97+
apt-get -y install git-core &>> $INSTALLLOG || OwnError "Unable To Install Git"
9898
fi
9999

100100
# Checking Name Servers

usr/local/sbin/easyengine

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ PYTHONSOFTWARE()
4747
{
4848
# Install Python Software Properties
4949
echo -e "\033[34mInstalling Python Software Properties, Please Wait...\e[0m"
50-
sudo $EEAPTGET install python-software-properties \
50+
$EEAPTGET install python-software-properties \
5151
|| OwnError "Unable To Install Python Software Properties"
5252
}
5353

@@ -57,7 +57,7 @@ NGINXREPO()
5757
then
5858
# Add Nginx Launchpad Repository
5959
echo -e "\033[34mAdding Brianmercer Nginx Launchpad Repository, Please Wait...\e[0m"
60-
sudo add-apt-repository -y ppa:brianmercer/nginx &>> $INSTALLLOG \
60+
add-apt-repository -y ppa:brianmercer/nginx &>> $INSTALLLOG \
6161
|| OwnError "Unable To Add Nginx Launchpad Repository"
6262

6363
elif [ -f /etc/debian_version ]
@@ -79,7 +79,7 @@ PHPREPO()
7979
then
8080
# Add PHP Launchpad Repository
8181
echo -e "\033[34mAdding Ondrej PHP5 Launchpad Repository, Please Wait...\e[0m"
82-
sudo add-apt-repository -y ppa:ondrej/php5 &>> $INSTALLLOG \
82+
add-apt-repository -y ppa:ondrej/php5 &>> $INSTALLLOG \
8383
|| OwnError "Unable To Add PHP5 Launchpad Repository"
8484

8585
elif [ -f /etc/debian_version ]
@@ -117,13 +117,13 @@ GPGKEY()
117117
then
118118
# Fix GPG Key Problems
119119
echo -e "\033[34mChecking GPG Keys For Brianmercer Nginx Repository, Please Wait...\e[0m"
120-
sudo apt-get update > /dev/null 2> /tmp/keymissing \
120+
apt-get update > /dev/null 2> /tmp/keymissing \
121121
|| OwnError "Unable To Fix GPG Keys For Brianmercer Nginx Repository "
122122

123123
for key in $(grep "NO_PUBKEY" /tmp/keymissing |sed "s/.*NO_PUBKEY //")
124124
do
125125
echo -e "\033[34mProcessing key: $key\e[0m"
126-
gpg --keyserver subkeys.pgp.net --recv $key && sudo gpg --export --armor $key | apt-key add -
126+
gpg --keyserver subkeys.pgp.net --recv $key && gpg --export --armor $key | apt-key add -
127127
done
128128
fi
129129
}
@@ -132,14 +132,14 @@ UPDATEAPT()
132132
{
133133
# Update The APT Cache
134134
echo -e "\033[34mUpdating APT Cache, Please Wait...\e[0m"
135-
sudo apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
135+
apt-get update &>> $INSTALLLOG || OwnError "Unable To Update APT Cache"
136136
}
137137

138138
INSTALLNGINX()
139139
{
140140
# Install Nginx
141141
echo -e "\033[34mInstalling Nginx, Please Wait...\e[0m"
142-
sudo $EEAPTGET install $NGINXPACKAGE || OwnError "Unable To Install Nginx"
142+
$EEAPTGET install $NGINXPACKAGE || OwnError "Unable To Install Nginx"
143143
}
144144

145145
EEMD5SUM()
@@ -264,7 +264,7 @@ INSTALLPHP()
264264
{
265265
# Install PHP5
266266
echo -e "\033[34mInstalling PHP5, Please Wait...\e[0m"
267-
sudo $EEAPTGET install php5-common php5-mysqlnd php5-xmlrpc \
267+
$EEAPTGET install php5-common php5-mysqlnd php5-xmlrpc \
268268
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
269269
php5-memcache memcached || OwnError "Unable To Install PHP5"
270270
}
@@ -376,7 +376,7 @@ INSTALLMYSQL()
376376

377377
# Install MySQL
378378
echo -e "\033[34mInstalling MySQL, Please Wait...\e[0m"
379-
sudo $EEAPTGET install mysql-server mysqltuner \
379+
$EEAPTGET install mysql-server mysqltuner \
380380
|| OwnError "Unable To Install MySQL"
381381
}
382382

@@ -394,7 +394,7 @@ INSTALLPOSTFIX()
394394

395395
# Install Postfix
396396
echo -e "\033[34mInstalling Postfix, Please Wait...\e[0m"
397-
sudo $EEAPTGET install postfix || OwnError "Unable To Install Postfix"
397+
$EEAPTGET install postfix || OwnError "Unable To Install Postfix"
398398
}
399399

400400
INSTALLALL()
@@ -405,7 +405,7 @@ INSTALLALL()
405405

406406
# Install Nginx PHP5 MySQL Postfix
407407
echo -e "\033[34mInstalling Nginx PHP5 MySQL Postfix, Please Wait...\e[0m"
408-
sudo $EEAPTGET install $NGINXPACKAGE php5-common php5-mysqlnd php5-xmlrpc \
408+
$EEAPTGET install $NGINXPACKAGE php5-common php5-mysqlnd php5-xmlrpc \
409409
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
410410
php5-memcache memcached mysql-server mysqltuner postfix \
411411
|| OwnError "Unable To Install Nginx PHP5 MySQL Postfix"
@@ -417,14 +417,14 @@ REMOVENGINX()
417417
{
418418
# Remove Nginx
419419
echo -e "\033[34mRemoving Nginx, Please Wait...\e[0m"
420-
sudo $EEAPTGET remove $NGINXPACKAGE nginx-common || OwnError "Unable To Remove Nginx"
420+
$EEAPTGET remove $NGINXPACKAGE nginx-common || OwnError "Unable To Remove Nginx"
421421
}
422422

423423
REMOVEPHP()
424424
{
425425
# Remove PHP5
426426
echo -e "\033[34mRemoving PHP5, Please Wait...\e[0m"
427-
sudo $EEAPTGET remove php5-common php5-mysqlnd php5-xmlrpc \
427+
$EEAPTGET remove php5-common php5-mysqlnd php5-xmlrpc \
428428
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
429429
php5-memcache memcached || OwnError "Unable To Remove PHP5"
430430
}
@@ -447,22 +447,22 @@ REMOVEMYSQL()
447447
{
448448
# Remove MySQL
449449
echo -e "\033[34mRemoving MySQL, Please Wait...\e[0m"
450-
sudo $EEAPTGET remove mysql-server mysqltuner \
450+
$EEAPTGET remove mysql-server mysqltuner \
451451
|| OwnError "Unable To Remove MySQL"
452452
}
453453

454454
REMOVEPOSTFIX()
455455
{
456456
# Remove Postfix
457457
echo -e "\033[34mRemoving Postfix, Please Wait...\e[0m"
458-
sudo $EEAPTGET remove postfix || OwnError "Unable To Remove Postfix"
458+
$EEAPTGET remove postfix || OwnError "Unable To Remove Postfix"
459459
}
460460

461461
REMOVEALL()
462462
{
463463
# Remove Nginx PHP5 MySQL Postfix
464464
echo -e "\033[34mRemoving Nginx PHP5 MySQL Postfix, Please Wait...\e[0m"
465-
sudo $EEAPTGET remove $NGINXPACKAGE nginx-common php5-common php5-mysqlnd php5-xmlrpc \
465+
$EEAPTGET remove $NGINXPACKAGE nginx-common php5-common php5-mysqlnd php5-xmlrpc \
466466
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
467467
php5-memcache memcached mysql-server mysqltuner postfix \
468468
|| OwnError "Unable To Remove Nginx PHP5 MySQL Postfix"
@@ -472,7 +472,7 @@ AUTOREMOVE()
472472
{
473473
# Remove Unwanted Packages
474474
echo -e "\033[34mRemoving Unwanted Packages, Please Wait...\e[0m"
475-
sudo $EEAPTGET autoremove || OwnError "Unable To Auto Remove"
475+
$EEAPTGET autoremove || OwnError "Unable To Auto Remove"
476476
}
477477

478478

@@ -481,14 +481,14 @@ PURGENGINX()
481481
{
482482
# Purge Nginx
483483
echo -e "\033[34mPurge Nginx, Please Wait...\e[0m"
484-
sudo $EEAPTGET purge $NGINXPACKAGE nginx-common || OwnError "Unable To Purge Nginx"
484+
$EEAPTGET purge $NGINXPACKAGE nginx-common || OwnError "Unable To Purge Nginx"
485485
}
486486

487487
PURGEPHP()
488488
{
489489
# Purge PHP5
490490
echo -e "\033[34mPurge PHP5, Please Wait...\e[0m"
491-
sudo $EEAPTGET purge php5-common php5-mysqlnd php5-xmlrpc \
491+
$EEAPTGET purge php5-common php5-mysqlnd php5-xmlrpc \
492492
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
493493
php5-memcache memcached || OwnError "Unable To Purge PHP5"
494494
}
@@ -497,22 +497,22 @@ PURGEMYSQL()
497497
{
498498
# Purge MySQL
499499
echo -e "\033[34mPurge MySQL, Please Wait...\e[0m"
500-
sudo $EEAPTGET purge mysql-server mysqltuner \
500+
$EEAPTGET purge mysql-server mysqltuner \
501501
|| OwnError "Unable To Purge MySQL"
502502
}
503503

504504
PURGEPOSTFIX()
505505
{
506506
# Purge Postfix
507507
echo -e "\033[34mPurge Postfix, Please Wait...\e[0m"
508-
sudo $EEAPTGET purge postfix || OwnError "Unable To Purge Postfix"
508+
$EEAPTGET purge postfix || OwnError "Unable To Purge Postfix"
509509
}
510510

511511
PURGEALL()
512512
{
513513
# Purge Nginx PHP5 MySQL Postfix
514514
echo -e "\033[34mRemoving Nginx PHP5 MySQL Postfix, Please Wait...\e[0m"
515-
sudo $EEAPTGET purge $NGINXPACKAGE nginx-common php5-common php5-mysqlnd php5-xmlrpc \
515+
$EEAPTGET purge $NGINXPACKAGE nginx-common php5-common php5-mysqlnd php5-xmlrpc \
516516
php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt \
517517
php5-memcache memcached mysql-server mysqltuner postfix \
518518
|| OwnError "Unable To Purge Nginx PHP5 MySQL Postfix"

0 commit comments

Comments
 (0)