Skip to content

Commit 1c4ed7a

Browse files
raupulusraupulus
authored
Merge pull request #190 from fryntiz/dev
v0.8.7
2 parents 3ce59dd + 4bdc9f1 commit 1c4ed7a

File tree

15 files changed

+93
-12
lines changed

15 files changed

+93
-12
lines changed

‎Apps/IDEs/phpstorm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ phpstorm_postconfiguracion() {
7575
}
7676

7777
phpstorm_instalador() {
78-
local version='PhpStorm-2019.1'
78+
local version='PhpStorm-2019.2.1'
7979

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

‎Apps/IDEs/pycharm_pro.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pycharm_postconfiguracion() {
7272
}
7373

7474
pycharm_pro_instalador() {
75-
local version='pycharm-professional-2019.1.1'
75+
local version='pycharm-professional-2019.2.1'
7676

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

‎Apps/IDEs/webstorm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ webstorm_postconfiguracion() {
7070
}
7171

7272
webstorm_instalador() {
73-
local version='WebStorm-2018.2.4'
73+
local version='WebStorm-2019.2.1'
7474

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

‎Apps/flatpak.sh

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ aplicaciones_flatpak() {
2424
echo -e "$VE Aplicaciones desde Flatpak$CL"
2525
actualizarRepositorios
2626

27-
## TODO → Comprobar si está instalado flatpak, sino pues instalar.
27+
## Compruebo si está instalado flatpak, sino instenta instalarlo
28+
if [[ ! -f '/usr/bin/flatpak']]; then
29+
instalarSoftware 'flatpak'
30+
fi
2831

2932
local gimp='https://flathub.org/repo/appstream/org.gimp.GIMP.flatpakref'
3033
local libreoffice='https://flathub.org/repo/appstream/org.libreoffice.LibreOffice.flatpakref'
@@ -33,6 +36,21 @@ aplicaciones_flatpak() {
3336
local krita='https://flathub.org/repo/appstream/org.kde.krita.flatpakref'
3437
local blender='https://flathub.org/repo/appstream/org.blender.Blender.flatpakref'
3538
local mypaint='https://flathub.org/repo/appstream/org.mypaint.MyPaint.flatpakref'
39+
local brackets='https://flathub.org/repo/appstream/io.brackets.Brackets.flatpakref'
40+
local arduino='https://flathub.org/repo/appstream/cc.arduino.arduinoide.flatpakref'
41+
local dbeaver='https://flathub.org/repo/appstream/io.dbeaver.DBeaverCommunity.flatpakref'
42+
local atom='https://flathub.org/repo/appstream/io.atom.Atom.flatpakref'
43+
local mumble='https://flathub.org/repo/appstream/info.mumble.Mumble.flatpakref'
44+
local synfig='https://flathub.org/repo/appstream/org.synfig.SynfigStudio.flatpakref'
45+
local xnconvert='https://flathub.org/repo/appstream/com.xnview.XnConvert.flatpakref'
46+
local anydesk='https://flathub.org/repo/appstream/com.anydesk.Anydesk.flatpakref'
47+
local gitkraken='https://flathub.org/repo/appstream/com.axosoft.GitKraken.flatpakref'
48+
local librepcb='https://flathub.org/repo/appstream/org.librepcb.LibrePCB.flatpakref'
49+
local playonlinux='https://flathub.org/repo/appstream/org.phoenicis.playonlinux.flatpakref'
50+
local androidstudio='https://flathub.org/repo/appstream/com.google.AndroidStudio.flatpakref'
51+
local riot='https://flathub.org/repo/appstream/im.riot.Riot.flatpakref'
52+
local discord='https://flathub.org/repo/appstream/com.discordapp.Discord.flatpakref'
53+
local postman='https://flathub.org/repo/appstream/com.getpostman.Postman.flatpakref'
3654

3755

3856
while true :; do
@@ -45,6 +63,21 @@ aplicaciones_flatpak() {
4563
5) Krita
4664
6) Blender
4765
7) MyPaint
66+
8) Brackets
67+
9) Arduino
68+
10) DBeaver
69+
11) Atom
70+
12) Mumble
71+
13) Synfig
72+
14) XnConvert
73+
15) Anydesk
74+
16) GitKraken
75+
17) LibrePCB
76+
18) PlayOnLinux
77+
19) AndroidStudio
78+
20) Riot
79+
21) Discord
80+
22) Postman
4881
4982
0) Atrás
5083
'
@@ -63,6 +96,21 @@ aplicaciones_flatpak() {
6396
5) instalarSoftwareFlatPak $krita;;
6497
6) instalarSoftwareFlatPak $blender;;
6598
7) instalarSoftwareFlatPak $mypain;;
99+
8) instalarSoftwareFlatPak $brackets;;
100+
9) instalarSoftwareFlatPak $arduino;;
101+
10) instalarSoftwareFlatPak $dbeaver;;
102+
11) instalarSoftwareFlatPak $atom;;
103+
12) instalarSoftwareFlatPak $mumble;;
104+
13) instalarSoftwareFlatPak $synfig;;
105+
14) instalarSoftwareFlatPak $xnconvert;;
106+
15) instalarSoftwareFlatPak $anydesk;;
107+
16) instalarSoftwareFlatPak $gitkraken;;
108+
17) instalarSoftwareFlatPak $librepcb;;
109+
18) instalarSoftwareFlatPak $playonlinux;;
110+
19) instalarSoftwareFlatPak $androidstudio;;
111+
20) instalarSoftwareFlatPak $riot;;
112+
21) instalarSoftwareFlatPak $discord;;
113+
22) instalarSoftwareFlatPak $postman;;
66114

67115
0) ## SALIR
68116
clear

‎Desktops/i3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ i3wm_postconfiguracion() {
6868
## Instalo y Configuro Python: Lenguajes-Programacion/python.sh
6969
python_instalador
7070

71-
python3Install 'i3pystatus' 'basiciw' 'netifaces' 'colour' \
71+
python3Install 'basiciw' 'netifaces' 'colour' \
7272
'pyalsaaudio' 'fontawesome'
7373

7474
## Tema Paper para GTK2 (Debe estar instalado)

‎Repositorios/debian/stable.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ stable_agregar_llaves() {
3434
echo -e "$VE Agregando llave para$RO PHP$VE de sury,org$CL"
3535
sudo wget -O '/etc/apt/trusted.gpg.d/php.gpg' 'https://packages.sury.org/php/apt.gpg'
3636
sudo chmod 744 '/etc/apt/trusted.gpg.d/php.gpg'
37+
38+
## Agregando llave para Gitlab Runner.
39+
echo -e "$VE Agregando llave para$RO Gitlab Runner$CL"
40+
curl -L "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" 2> /dev/null | sudo apt-key add - &>/dev/null
3741
}
3842

3943
##

‎Repositorios/debian/stable/sources.list.d/runner_gitlab-runner.list

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# this file was generated by packages.gitlab.com for
2+
# the repository at https://packages.gitlab.com/runner/gitlab-runner
3+
4+
deb https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main
5+
deb-src https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main
6+
7+
# import the gpg key
8+
#curl -L "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" 2> /dev/null | sudo apt-key add - &>/dev/null

‎Repositorios/debian/stable/sources.list.d/tor.list

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
########################################################
22
## TOR ##
33
########################################################
4-
deb https://deb.torproject.org/torproject.org stretch main
5-
deb-src https://deb.torproject.org/torproject.org stretch main
4+
deb https://deb.torproject.org/torproject.org buster main
5+
deb-src https://deb.torproject.org/torproject.org buster main

‎Repositorios/raspbian.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ agregarRepositoriosRaspbian() {
4646
echo -e "$VE Instalando llaves de repositorios$CL"
4747
instalarSoftware debian-keyring
4848
instalarSoftware pkg-mozilla-archive-keyring
49+
50+
## Agregando llave para Gitlab Runner.
51+
echo -e "$VE Agregando llave para$RO Gitlab Runner$CL"
52+
curl -L "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" 2> /dev/null | sudo apt-key add - &>/dev/null
4953
}
5054

5155
##

‎Repositorios/raspbian/sources.list

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
deb http://mirrordirector.raspbian.org/raspbian/ stable main contrib non-free rpi firmware
2-
deb-src http://mirrordirector.raspbian.org/raspbian/ stable main contrib non-free rpi firmware
3-
#deb http://archive.raspberrypi.org/debian/ buster main ui
4-
#deb-src http://archive.raspberrypi.org/debian/ buster main ui
1+
deb http://raspbian.raspberrypi.org/raspbian/ stable main contrib non-free rpi firmware
2+
deb-src http://raspbian.raspberrypi.org/raspbian/ stable main contrib non-free rpi firmware

‎Repositorios/raspbian/sources.list.d/runner_gitlab-runner.list

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# this file was generated by packages.gitlab.com for
2+
# the repository at https://packages.gitlab.com/runner/gitlab-runner
3+
4+
deb https://packages.gitlab.com/runner/gitlab-runner/raspbian/ buster main
5+
deb-src https://packages.gitlab.com/runner/gitlab-runner/raspbian/ buster main
6+
7+
# import the gpg key
8+
#curl -L "https://packages.gitlab.com/runner/gitlab-runner/gpgkey" 2> /dev/null | sudo apt-key add - &>/dev/null

‎Software-Lists/debian/Desktops/i3wm.lst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ i3-wm
33
i3blocks
44
i3lock
55
i3status
6+
i3pystatus

‎Software-Lists/raspbian/Basico/tipografias.lst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
xfonts-scalable
2+
xfonts-100dpi
3+
xfonts-75dpi
4+
xfonts-base
5+
xfonts-utils

‎conf/home/.local/bin/actualizar

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ actualizarSistema() {
5959
python3 -m pip_review --local --auto
6060
fi
6161

62+
if [[ -f '/usr/bin/composer' ]] || [[ -f "$HOME/.local/bin/composer" ]]; then
63+
echo "Actualizando desde Composer"
64+
composer global update
65+
fi
66+
6267
if [[ "$DISTRO" = 'raspbian' ]]; then
6368
sudo rpi-update
6469
fi

‎main.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ fi
5050

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

0 commit comments

Comments
 (0)