From 5e1a88db0f319789459940e1c656ab634bef9598 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Fri, 15 Apr 2016 11:32:33 -0300
Subject: [PATCH] Corrigido install.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Verificação de string vazia estava checando um parmetro inexistente
(os problemas do ctrl+c e ctrl+v do stackoverflow)
---
debian-based/install.sh | 36 +++++++++++++++++++-----------------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/debian-based/install.sh b/debian-based/install.sh
index 97c55d9..261b333 100755
--- a/debian-based/install.sh
+++ b/debian-based/install.sh
@@ -24,6 +24,8 @@ function install {
function fresh-install {
update
install
+ sudo apt-get install -y $PACKAGES
+ ruby
}
function list {
@@ -44,19 +46,20 @@ function help {
#Se o arquivo não existe, o script cria
if [ ! -f "$ABSOLUTE_PATH/packages.txt" ]
then
- packages="ssh:openssh-client openssh-server
- php:php5 php5-mysql php5-pgsql php5-sqlite
- mysql:mysql-client mysql-server
- nodejs:nodejs npm
- git:git
- editors:vim gedit
- openjdk:openjdk-7-jre openjdk-7-jdk default-jdk default-jre
- flash:pepperflashplugin-nonfree
- xchm:xchm
- latex:texlive-full kile
- curl:curl
- make:make"
- echo $packages > "$ABSOLUTE_PATH/packages.txt"
+ packages="ssh:openssh-client openssh-server\n"
+ packages="${packages}php:php5 php5-mysql php5-pgsql php5-sqlite\n"
+ packages="${packages}mysql:mysql-client mysql-server\n"
+ packages="${packages}nodejs:nodejs npm\n"
+ packages="${packages}git:git\n"
+ packages="${packages}editors:vim gedit\n"
+ packages="${packages}openjdk:openjdk-7-jre openjdk-7-jdk default-jdk default-jre\n"
+ packages="${packages}flash:pepperflashplugin-nonfree\n"
+ packages="${packages}xchm:xchm\n"
+ packages="${packages}latex:texlive-full kile\n"
+ packages="${packages}curl:curl\n"
+ packages="${packages}make:make\n"
+
+ echo -e $packages > "$ABSOLUTE_PATH/packages.txt"
fi
while [[ $# > 0 ]]
do
@@ -64,7 +67,6 @@ do
case $key in
-f|--fresh-install)
fresh-install
- sudo apt-get install -y $PACKAGES
exit 0
;;
-h|--help)
@@ -85,10 +87,10 @@ do
esac
shift
done
-if [ -z "${param// }" ]
+#Checa se a string não está vazia
+if [ ! -z "${PACKAGES// }" ]
then
- # sudo apt-get install -y $PACKAGES
- echo $PACKAGES
+ sudo apt-get install -y $PACKAGES
else
help
fi
--
GitLab