Skip to content

Commit bdd6b1a

Browse files
raupulusraupulus
authored
Merge pull request #185 from fryntiz/dev
Nueva versión 0.8.2
2 parents 878eff6 + 3b32a78 commit bdd6b1a

File tree

33 files changed

+734
-189
lines changed

33 files changed

+734
-189
lines changed

‎Accesos_Directos/Arduino-IDE.desktop

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
[Desktop Entry]
2+
Type=Application
3+
Name=Arduino IDE
4+
GenericName=Arduino IDE
5+
Comment=Open-source electronics prototyping platform
6+
Exec=~/.local/opt/arduino/arduino
7+
Icon=arduino-arduinoide
8+
Terminal=false
9+
Categories=Development;IDE;Electronics;
10+
MimeType=text/x-arduino;
11+
Keywords=embedded electronics;electronics;avr;microcontroller;
12+
StartupWMClass=processing-app-Base
13+
Name[es_ES]=Arduino IDE

‎Accesos_Directos/Telegram.desktop

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Name=Telegram Desktop
4+
Comment=Official desktop application for the Telegram messaging service
5+
TryExec=/home/fryntiz/4_Programas/Telegram/Telegram/Telegram
6+
Exec=~/.local/opt/Telegram/Telegram -- %u
7+
Icon=telegram
8+
Terminal=false
9+
StartupWMClass=TelegramDesktop
10+
Type=Application
11+
Categories=Network;InstantMessaging;Qt;
12+
MimeType=x-scheme-handler/tg;
13+
X-Desktop-File-Install-Version=0.23
14+
Name[es_ES]=Telegram

‎Accesos_Directos/gimp2.10.desktop.desktop renamed to ‎Accesos_Directos/gimp2.10.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ Categories=Multimedia;Image Editor;
1616
MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
1717
StartupWMClass=Gimp 2.10
1818
StartupNotify=true
19-
Name[es_ES]=Gimp 2.10
19+
Name[es_ES]=gimp2.10

‎Apps/IDEs/0_Main.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ source "$WORKSCRIPT/Apps/IDEs/pycharm_pro.sh"
2929
source "$WORKSCRIPT/Apps/IDEs/webstorm.sh"
3030
source "$WORKSCRIPT/Apps/IDEs/netbeans.sh"
3131
source "$WORKSCRIPT/Apps/IDEs/aptanastudio.sh"
32+
source "$WORKSCRIPT/Apps/IDEs/Arduino.sh"
3233

3334
############################
3435
## FUNCIONES ##
@@ -64,7 +65,8 @@ menuIDES() {
6465
7) NetBeans (No implementado)
6566
8) Aptana Studio (No implementado)
6667
9) Web Storm
67-
10) Todos los pasos anteriores
68+
10) Arduino
69+
11) Todos los pasos anteriores
6870
6971
0) Atrás
7072
'
@@ -82,9 +84,10 @@ menuIDES() {
8284
4) pycharm_pro_instalador;; ## Instala Pycharm Profesional
8385
#5) ;; ##
8486
6) ninjaide_instalador;; ## Instala Ninja IDE
85-
9) webstorm_instalador;; ## Instala Ninja IDE
86-
10) todos_IDES ## Todos los IDES
87-
break;;
87+
9) webstorm_instalador;; ##
88+
10) arduino_instalador;; ##
89+
11) todos_IDES ## Todos los IDES
90+
break;;
8891

8992
0) ## SALIR
9093
clear

‎Apps/IDEs/Arduino.sh

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#!/usr/bin/env bash
2+
# -*- ENCODING: UTF-8 -*-
3+
##
4+
## @author Raúl Caro Pastorino
5+
## @copyright Copyright © 2018 Raúl Caro Pastorino
6+
## @license https://wwww.gnu.org/licenses/gpl.txt
7+
## @email tecnico@fryntiz.es
8+
## @web www.fryntiz.es
9+
## @github https://github.com/fryntiz
10+
## @gitlab https://gitlab.com/fryntiz
11+
## @twitter https://twitter.com/fryntiz
12+
##
13+
## Guía de estilos aplicada:
14+
## @style https://github.com/fryntiz/Bash_Style_Guide
15+
16+
############################
17+
## INSTRUCCIONES ##
18+
############################
19+
## Descarga el IDE de Arduino desde la página web en su última versión estable
20+
21+
############################
22+
## FUNCIONES ##
23+
############################
24+
25+
arduino_descargar() {
26+
local version="${1}-linux64"
27+
descargar "${version}.tar.xz" "https://downloads.arduino.cc/${version}.tar.xz"
28+
}
29+
30+
arduino_preconfiguracion() {
31+
echo -e "$VE Generando Pre-Configuraciones de$RO arduino$CL"
32+
if [[ -d "$HOME/.local/opt/arduino" ]]; then
33+
rm -Rf "$HOME/.local/opt/arduino"
34+
fi
35+
36+
if [[ -h "$HOME/.local/bin/arduino" ]]; then
37+
rm -f "$HOME/.local/bin/arduino"
38+
fi
39+
40+
if [[ -f "$HOME/.local/share/applications/Arduino-IDE.desktop" ]]; then
41+
rm -f "$HOME/.local/share/applications/Arduino-IDE.desktop"
42+
fi
43+
}
44+
45+
arduino_instalar() {
46+
echo -e "$VE Instalando$RO arduino$CL"
47+
echo -e "$VE Extrayendo IDE$CL"
48+
49+
local version="$1"
50+
51+
cd "$WORKSCRIPT/tmp/" || return 0
52+
53+
tar -Jxvf "${version}-linux64.tar.xz" 2>> /dev/null
54+
55+
if [[ -d "$WORKSCRIPT/tmp/$version" ]]; then
56+
mv "$WORKSCRIPT/tmp/$version" "$HOME/.local/opt/arduino"
57+
fi
58+
59+
cd "$WORKSCRIPT" || exit 1
60+
}
61+
62+
arduino_postconfiguracion() {
63+
echo -e "$VE Generando Post-Configuraciones$RO arduino$CL"
64+
65+
echo -e "$VE Generando acceso directo$CL"
66+
rm -f "$HOME/.local/share/applications/Arduino-IDE.desktop"
67+
cp "$WORKSCRIPT/Accesos_Directos/Arduino-IDE.desktop" "$HOME/.local/share/applications/"
68+
69+
echo -e "$VE Generando comando$RO arduino$CL"
70+
ln -s "$HOME/.local/opt/arduino/arduino" "$HOME/.local/bin/arduino"
71+
}
72+
73+
arduino_instalador() {
74+
echo -e "$VE Comenzando instalación de$RO arduino$CL"
75+
local version='arduino-1.8.5'
76+
77+
arduino_preconfiguracion "$version"
78+
79+
if [[ -f "$HOME/.local/bin/arduino" ]] &&
80+
[[ -d "$HOME/.local/opt/arduino" ]]
81+
then
82+
echo -e "$VE Ya esta$RO arduino$VE instalado en el equipo, omitiendo paso$CL"
83+
else
84+
if [[ -f "$WORKSCRIPT/tmp/${version}-linux64.tar.xz" ]]; then
85+
arduino_instalar "$version" || rm -Rf "$WORKSCRIPT/tmp/${version}-linux64.tar.xz"
86+
else
87+
arduino_descargar "$version"
88+
arduino_instalar "$version"
89+
fi
90+
fi
91+
92+
arduino_postconfiguracion "$version"
93+
}

‎Apps/IDEs/phpstorm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ phpstorm_preconfiguracion() {
3535
rm -Rf "$HOME/.local/opt/phpstorm"
3636
fi
3737

38-
if [[ -f "$HOME/.local/bin/phpstorm" ]]; then
38+
if [[ -h "$HOME/.local/bin/phpstorm" ]]; then
3939
rm -f "$HOME/.local/bin/phpstorm"
4040
fi
4141

‎Apps/Packages/0_Main.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ menuPaquetes() {
3636
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/developer.lst"
3737
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/diseño-grafico.lst"
3838
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/edicion-multimedia.lst"
39-
instalarSoftwareFlatPakLista "$WORKSCRIPT/Apps/Packages/flatpak.lst"
4039
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/internet.lst"
4140
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/x11-base.lst"
4241
instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/firmware.lst"
@@ -53,12 +52,12 @@ menuPaquetes() {
5352
1) Developer
5453
2) Diseño Gráfico
5554
3) Edición Multimedia
56-
4) Flatpak
57-
5) Internet
58-
6) Firmware (Controladores)
59-
7) X11 base (xorg xorg-server...)
60-
8 7) Todos los pasos anteriores
55+
4) Internet
56+
5) Firmware (Controladores)
57+
6) X11 base (xorg xorg-server...)
58+
7) Todos los pasos anteriores
6159
60+
8) Flatpak
6261
9) VPS
6362
6463
0) Atrás
@@ -74,12 +73,13 @@ menuPaquetes() {
7473
1) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/developer.lst";;
7574
2) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/diseño-grafico.lst";;
7675
3) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/edicion-multimedia.lst";;
77-
4) instalarSoftwareFlatPakLista "$WORKSCRIPT/Apps/Packages/flatpak.lst";;
78-
5) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/internet.lst";;
79-
6) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/firmware.lst";;
80-
7) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/x11-base.lst";;
81-
8) todos_paquetes
76+
4) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/internet.lst";;
77+
5) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/firmware.lst";;
78+
6) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/x11-base.lst";;
79+
7) todos_paquetes
8280
break;;
81+
8) instalarSoftwareFlatPakLista
82+
"$WORKSCRIPT/Apps/Packages/flatpak.lst";;
8383
9) instalarSoftwareLista "$WORKSCRIPT/Apps/Packages/vps.lst";;
8484

8585
0) ## SALIR

‎Desktops/i3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ i3wm_postconfiguracion() {
5656
echo -e "$VE Generando Post-Configuraciones$RO i3wm$CL"
5757

5858
echo -e "$VE Instalando software secundario$CL"
59-
instalarSoftware rxvt-unicode-256color compton compton-conf compton-conf-l10n nitrogen thunar ranger w3m tint2 arandr xbacklight gvfs gpicview mplayer cmus zathura xautolock xbindkeys xbindkeys-config pulseaudio volumeicon-alsa alsamixergui xfce4-settings firewall-applet firewall-config firewalld unclutter lxappearance gtk-chtheme qt4-qtconfig pm-utils xfce4-screenshooter parcellite zenity scrot lxpolkit ssh-askpass wireless-tools fonts-powerline xfce4-clipman redshift
59+
instalarSoftware rxvt-unicode-256color compton compton-conf compton-conf-l10n nitrogen thunar ranger w3m tint2 arandr xbacklight gvfs gpicview mplayer cmus zathura xautolock xbindkeys xbindkeys-config pulseaudio volumeicon-alsa alsamixergui xfce4-settings firewall-applet firewall-config firewalld unclutter lxappearance gtk-chtheme qt4-qtconfig pm-utils xfce4-screenshooter parcellite zenity scrot lxpolkit ssh-askpass wireless-tools fonts-powerline xfce4-clipman redshift lm-sensors libsensors4-dev
6060

6161
echo -e "$VE Generando archivos de configuración$CL"
6262
enlazarHome '.config/i3' '.config/tint2' '.config/compton.conf' '.config/conky' '.Xresources' '.config/nitrogen' '.config/i3status' '.config/plank' '.config/rofi'

‎Lenguajes-Programacion/python.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ python_postconfiguracion() {
5555
echo -e "$VE Preparando configuracion de$RO Python2$CL"
5656
echo -e "$VE Instalando dependencias para Python 2$CL"
5757

58-
local dependencias='python-autopep8 python-bottle python-cryptography python-dev python-enum34 python-flake python-frozendict python-future python-idna python-ipaddress python-ipython python-jedi python-mccabe python-mysqldb python-openssl python-pep8 python-pip python-powerline python-powerline-taskwarrior python-pyasn1 python-pycodestyle python-pyflakes python-pygments python-pylama python-setuptools python-urllib3 python-virtualenv python-waitress python-pymongo'
58+
local dependencias='python-psycopg2 python-autopep8 python-bottle python-cryptography python-dev python-enum34 python-flake python-frozendict python-future python-idna python-ipaddress python-ipython python-jedi python-mccabe python-mysqldb python-openssl python-pep8 python-pip python-powerline python-powerline-taskwarrior python-pyasn1 python-pycodestyle python-pyflakes python-pygments python-pylama python-setuptools python-urllib3 python-virtualenv python-waitress python-pymongo python-scapy'
5959

6060
instalarSoftware "$dependencias"
6161

@@ -66,7 +66,7 @@ python_postconfiguracion() {
6666
echo -e "$VE Preparando configuracion de$RO Python3$CL"
6767
echo -e "$VE Instalando dependencias para Python 3$CL"
6868

69-
local dependencias='python3-dev python3-flake8 python3-frozendict python3-future python3-ipython python3-mccabe python3-mysqldb python3-pep8 python3-pep8-naming python3-pip python3-pylama python3-powerline python3-powerline-taskwarrior python3-pycodestyle python3-pyflakes python3-setuptools python3-virtualenv python3-pymongo'
69+
local dependencias='python3-psycopg2 python3-dev python3-flake8 python3-frozendict python3-future python3-ipython python3-mccabe python3-mysqldb python3-pep8 python3-pep8-naming python3-pip python3-pylama python3-powerline python3-powerline-taskwarrior python3-pycodestyle python3-pyflakes python3-setuptools python3-virtualenv python3-pymongo python3-scapy'
7070

7171
instalarSoftware "$dependencias"
7272

‎Repositorios/0_Main.sh

Lines changed: 47 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
## @author Raúl Caro Pastorino
55
## @copyright Copyright © 2018 Raúl Caro Pastorino
66
## @license https://wwww.gnu.org/licenses/gpl.txt
7-
## @email tecnico@fryntiz.es
8-
## @web www.fryntiz.es
7+
## @email dev@fryntiz.es
8+
## @web https://fryntiz.es
99
## @github https://github.com/fryntiz
1010
## @gitlab https://gitlab.com/fryntiz
1111
## @twitter https://twitter.com/fryntiz
@@ -20,9 +20,10 @@
2020
############################
2121
## IMPORTACIONES ##
2222
############################
23-
source "$WORKSCRIPT/Repositorios/comunes.sh"
2423
source "$WORKSCRIPT/Repositorios/stable.sh"
2524
source "$WORKSCRIPT/Repositorios/testing.sh"
25+
source "$WORKSCRIPT/Repositorios/unstable.sh"
26+
source "$WORKSCRIPT/Repositorios/comunes.sh"
2627

2728
###########################
2829
## FUNCIONES ##
@@ -32,13 +33,40 @@ source "$WORKSCRIPT/Repositorios/testing.sh"
3233
## @param $1 -a Si recibe este parámetro lo hará de forma automática
3334
##
3435
menuRepositorios() {
36+
##
37+
## Instala dependencias para actualizar repositorios e instalar
38+
##
39+
instalar_dependencias() {
40+
echo -e "$VE Actualizando repositorios por primera vez$CL"
41+
sudo apt update >> /dev/null 2>> /dev/null
42+
instalarSoftware apt-transport-https && echo -e "$VE Instalado el paquete$RO apt-transport-https$CL" || echo -e "$VE Error al instalar$RO apt-transport-https$CL"
43+
44+
instalarSoftware dirmngr && echo -e "$VE Instalado el paquete$RO dirmngr$CL" || echo -e "$VE Error al instalar$RO dirmngr$CL"
45+
echo -e "$VE Agregando Repositorios$CL"
46+
47+
instalarSoftware 'curl'
48+
}
49+
50+
##
51+
## Instala paquetes para gestionar llaves de repositorios
52+
##
53+
prepararLlaves() {
54+
echo -e "$VE Instalando llaves de repositorios$CL"
55+
56+
instalarSoftware debian-keyring
57+
instalarSoftware pkg-mozilla-archive-keyring
58+
}
59+
60+
instalar_dependencias
61+
prepararLlaves
3562

3663
elegirRama() {
3764
while true; do
3865
clear
3966
local descripcion='Menú para configurar e integrar repositorios
4067
1) Stable
4168
2) Testing
69+
3) Unstable
4270
4371
0) Atrás
4472
'
@@ -53,6 +81,8 @@ menuRepositorios() {
5381
break;;
5482
2) testing_agregar_repositorios
5583
break;;
84+
3) unstable_agregar_repositorios
85+
break;;
5686

5787
0) ## SALIR
5888
clear
@@ -69,7 +99,8 @@ menuRepositorios() {
6999

70100
## Si la función recibe "-a" indica que detecte de forma automática
71101
if [[ "$1" = '-a' ]]; then
72-
local testing=('buster/sid' 'buster' 'buster/testing' 'testing')
102+
local unstable=('sid' 'unstable')
103+
local testing=('buster' 'buster/testing' 'testing')
73104
local version='stable' ## Indica los repositorios a configurar
74105

75106
## Almaceno el primer caracter de la versión ("9" por ejemplo en stable)
@@ -85,6 +116,9 @@ menuRepositorios() {
85116
if [[ $v = $version ]]; then
86117
version='testing'
87118
break
119+
elif [[ $v = $version ]]; then
120+
version='unstable'
121+
break
88122
fi
89123
done
90124

@@ -93,10 +127,19 @@ menuRepositorios() {
93127
stable_agregar_repositorios
94128
elif [[ $version = 'testing' ]]; then
95129
testing_agregar_repositorios
130+
elif [[ $version = 'unstable' ]]; then
131+
unstable_agregar_repositorios
96132
else
97133
elegirRama
98134
fi
99135
else
100136
elegirRama
101137
fi
138+
139+
comunes_agregar_repositorios
140+
141+
## Asigna lectura a todos para buscar paquetes sin sudo
142+
sudo chmod 744 /etc/apt/sources.list
143+
sudo chmod 744 -R /etc/apt/sources.list.d
144+
sudo chmod 755 /etc/apt/sources.list.d
102145
}

‎Repositorios/stable/sources.list.d/kalilinux.list renamed to ‎Repositorios/Comunes/sources.list.d/kalilinux.list

File renamed without changes.

‎Repositorios/stable/sources.list.d/webmin.list renamed to ‎Repositorios/Comunes/sources.list.d/webmin.list

File renamed without changes.

0 commit comments

Comments
 (0)