Skip to content

Commit

Permalink
Merge pull request #199 from fryntiz/dev
Browse files Browse the repository at this point in the history
v0.8.8
  • Loading branch information
raupulus committed Oct 12, 2019
2 parents 52654e3 + 36bc523 commit 6c4f4f6
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Apps/IDEs/Arduino.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ arduino_postconfiguracion() {

arduino_instalador() {
echo -e "$VE Comenzando instalación de$RO arduino$CL"
local version='arduino-1.8.5'
local version='arduino-1.8.10'

arduino_preconfiguracion "$version"

Expand Down
9 changes: 5 additions & 4 deletions Apps/IDEs/Ninja-IDE.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
## FUNCIONES ##
############################
ninjaide_descargar() {
descargar 'ninja-ide_2.3-2_all.deb' 'http://ftp.es.debian.org/debian/pool/main/n/ninja-ide/ninja-ide_2.3-2_all.deb'
##descargar 'ninja-ide.deb' 'http://ftp.es.debian.org/debian/pool/main/n/ninja-ide/ninja-ide_2.3-2_all.deb'
descargar 'ninja-ide.deb' 'https://github.com/ninja-ide/ninja-ide/releases/download/v2.4/ninja-ide-2.4.deb'
}

ninjaide_preconfiguracion() {
Expand All @@ -34,7 +35,7 @@ ninjaide_preconfiguracion() {
ninjaide_instalar() {
echo -e "$VE Preparando para instalar$RO Ninja IDE$CL"
instalarSoftware python-qt4 >> /dev/null 2>> /dev/null && echo -e "$VE Se ha instalado$RO python-qt4$CL" || echo -e "$VE No se ha instalado$RO python-qt4$CL"
instalarSoftwareDPKG "$WORKSCRIPT/tmp/ninja-ide_2.3-2_all.deb"
instalarSoftwareDPKG "$WORKSCRIPT/tmp/ninja-ide.deb"
}

ninjaide_postconfiguracion() {
Expand All @@ -60,7 +61,7 @@ ninjaide_instalador() {
if [[ -f '/usr/bin/ninja-ide' ]]; then
echo -e "$VE Ya esta$RO Ninja IDE$VE instalado en el equipo, omitiendo paso$CL"
else
if [[ -f "$WORKSCRIPT/tmp/ninja-ide_2.3-2_all.deb" ]]; then
if [[ -f "$WORKSCRIPT/tmp/ninja-ide.deb" ]]; then
ninjaide_instalar
else
ninjaide_descargar
Expand All @@ -69,7 +70,7 @@ ninjaide_instalador() {

## Si falla la instalación se rellama la función tras limpiar
if [[ ! -f '/usr/bin/ninja-ide' ]]; then
rm -f "$WORKSCRIPT/tmp/ninja-ide_2.3-2_all.deb"
rm -f "$WORKSCRIPT/tmp/ninja-ide.deb"
ninjaide_descargar
ninjaide_instalar
fi
Expand Down
2 changes: 1 addition & 1 deletion Apps/IDEs/phpstorm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ phpstorm_postconfiguracion() {
}

phpstorm_instalador() {
local version='PhpStorm-2019.2.1'
local version='PhpStorm-2019.2.3'

echo -e "$VE Comenzando instalación de$RO PhpStorm$CL"

Expand Down
2 changes: 1 addition & 1 deletion Apps/IDEs/pycharm_pro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pycharm_postconfiguracion() {
}

pycharm_pro_instalador() {
local version='pycharm-professional-2019.2.1'
local version='pycharm-professional-2019.2.3'

echo -e "$VE Comenzando instalación de$RO PyCharm$CL"

Expand Down
2 changes: 1 addition & 1 deletion Apps/IDEs/webstorm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ webstorm_postconfiguracion() {
}

webstorm_instalador() {
local version='WebStorm-2019.2.1'
local version='WebStorm-2019.2.3'

echo -e "$VE Comenzando instalación de$RO WebStorm$CL"

Expand Down
2 changes: 1 addition & 1 deletion Apps/flatpak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ aplicaciones_flatpak() {
actualizarRepositorios

## Compruebo si está instalado flatpak, sino instenta instalarlo
if [[ ! -f '/usr/bin/flatpak']]; then
if [[ ! -f '/usr/bin/flatpak' ]]; then
instalarSoftware 'flatpak'
fi

Expand Down
12 changes: 12 additions & 0 deletions configuraciones.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,25 @@ configurar_hosts() {
fi
}

##
## Crea los directorios básicos para configuraciones.
##
crear_directorios() {
dir_exist_or_create "$HOME/.local"
dir_exist_or_create "$HOME/.local/bin"
dir_exist_or_create "$HOME/.local/lib"
dir_exist_or_create "$HOME/.local/opt"
dir_exist_or_create "$HOME/.local/share"
}

##
## Instalar Todas las configuraciones
##
instalar_configuraciones() {
cd "$WORKSCRIPT"

configurar_hosts
crear_directorios

sudo update-command-not-found >> /dev/null 2>> /dev/null
}
13 changes: 13 additions & 0 deletions funciones.sh
Original file line number Diff line number Diff line change
Expand Up @@ -460,3 +460,16 @@ python3InstallGlobal() {
sudo pip3 install --upgrade "$x"
done
}

##
## Comprueba si existe el directorio, en caso contrario lo creará.
## @param $1 Recibe la ruta hacia el directorio que se comprobará/creará.
##
dir_exist_or_create() {
dir="$1"

echo -e "$VE Creando directorio$RO $dir$CL"
if [[ ! -d "$dir" ]]; then
mkdir -p "$dir"
fi
}
2 changes: 1 addition & 1 deletion main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fi

WORKSCRIPT=$PWD ## Directorio principal del script
USER=$(whoami) ## Usuario que ejecuta el script
VERSION='0.8.7' ## Versión en desarrollo
VERSION='0.8.8' ## Versión en desarrollo
MY_DISTRO="$DISTRO" ## Distribución sobre la que se ejecuta
MY_BRANCH="$BRANCH" ## stable|testing|unstable
MY_ENV="$ENV" ## prod|dev desde /etc/environment o .env
Expand Down

0 comments on commit 6c4f4f6

Please sign in to comment.