diff --git a/README.md b/README.md index 34e1681..beaa02d 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,4 @@ Intentamos hacer Linux utilizable por cualquiera, aunque no tenga casi experienc - -Aquí solo se encuentran los scripts de instalacion y ciertas modificaciones de la iso \ No newline at end of file +Aquí solo se encuentran los scripts de instalacion y ciertas modificaciones \ No newline at end of file diff --git a/installer/archinstall-dev.sh b/installer/installer.sh similarity index 99% rename from installer/archinstall-dev.sh rename to installer/installer.sh index 5033a85..ef61784 100755 --- a/installer/archinstall-dev.sh +++ b/installer/installer.sh @@ -479,8 +479,7 @@ function installconf { execl chroot systemctl enable ntpd # User and desktop skel - wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- | tar xJf - -C /mnt/ - wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/MATE.tar.xz -O- | tar xJf - -C /mnt/ + wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/skeluser.tar.xz -O- | tar xJf - -C /mnt/ # Create user execl chroot useradd -m -G wheel -s /bin/bash $nameuser diff --git a/mods/jkarch-appearance.tar.xz b/installer/jkarch-appearance.tar.xz similarity index 100% rename from mods/jkarch-appearance.tar.xz rename to installer/jkarch-appearance.tar.xz diff --git a/installer/skeluser.tar.xz b/installer/skeluser.tar.xz new file mode 100644 index 0000000..898ed9e Binary files /dev/null and b/installer/skeluser.tar.xz differ diff --git a/mods/LXDE.tar.xz b/mods/LXDE.tar.xz deleted file mode 100644 index a21d3af..0000000 Binary files a/mods/LXDE.tar.xz and /dev/null differ diff --git a/mods/MATE.tar.xz b/mods/MATE.tar.xz deleted file mode 100644 index 55983c4..0000000 Binary files a/mods/MATE.tar.xz and /dev/null differ diff --git a/mods/XFCE4.tar.xz b/mods/XFCE4.tar.xz deleted file mode 100644 index db6833d..0000000 Binary files a/mods/XFCE4.tar.xz and /dev/null differ diff --git a/mods/skel.tar.xz b/mods/skel.tar.xz deleted file mode 100644 index d5ee15a..0000000 Binary files a/mods/skel.tar.xz and /dev/null differ diff --git a/archinstall/archinstall.sh b/oldarchinstall/archinstall.sh similarity index 100% rename from archinstall/archinstall.sh rename to oldarchinstall/archinstall.sh diff --git a/archinstall/downloadinstall.sh b/oldarchinstall/downloadinstall.sh similarity index 100% rename from archinstall/downloadinstall.sh rename to oldarchinstall/downloadinstall.sh diff --git a/archinstall/pacman-offline.conf b/oldarchinstall/pacman-offline.conf similarity index 100% rename from archinstall/pacman-offline.conf rename to oldarchinstall/pacman-offline.conf diff --git a/archinstall/pacman.conf b/oldarchinstall/pacman.conf similarity index 100% rename from archinstall/pacman.conf rename to oldarchinstall/pacman.conf diff --git a/archinstall/selectlang.sh b/oldarchinstall/selectlang.sh similarity index 100% rename from archinstall/selectlang.sh rename to oldarchinstall/selectlang.sh diff --git a/archinstall/translations.sh b/oldarchinstall/translations.sh similarity index 100% rename from archinstall/translations.sh rename to oldarchinstall/translations.sh diff --git a/programas/jkarch-conf/jkarch-conf b/programas/jkarch-conf/jkarch-conf deleted file mode 100755 index cc56019..0000000 --- a/programas/jkarch-conf/jkarch-conf +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash -function pause { -echo "Pulse enter para continuar..." -read -} - -function mostrardialog { -local titled -local msgd -titled=$1 -msgd=$2 -Xdialog --title "$titled" --msgbox "$msgd" 15 60 -} - -## ESTA EN PROCESO, ESTE SCRIPT NO HACE NADA ACTUALMENTE -exit - -optb=`dialog --stdout --checklist "¿Editores de texto y/o office?" 0 0 6 1 "Libreoffice" on 2 "AbiWord" off 3 "Gnumeric" off 4 "WPS Office" off 5 "leafpad (Bloc de notas)" on 6 "gedit" off 7 "notepadqq" off` -case $optb in - *1*) - packb="libreoffice-fresh";;& - *2*) - packb="$packb abiword";;& - *3*) - packb="$packb gnumeric";;& - *4*) - packb="$packb wps-office";;& - *5*) - packb="$packb leafpad";;& - *6*) - packb="$packb gedit";;& - *7*) - packb="$packb notepadqq";;& -esac -pacman -S $packb --noconfirm - -clear -optentorno=`dialog --stdout --nocancel --menu "Escoje tu entorno de escritorio" 0 0 5 1 "LXDE (Muy liviano)" 2 "XFCE (Liviano y bonito)" 3 "Cinnamon (Facil para antiguos usuarios de Windows)" 4 "Gnome (Complejo, pero practico)" 5 "Plasma/KDE (Pesado aunque bonito) " 6 "No instalar nada, solo la terminal de comandos"` - -case $optentorno in - 1) - pacman -S lxde --noconfirm - #Quitar paquetes no necesarios para correr lxde - pacman -R lxmusic lxlauncher lxdm --noconfirm - instentorno=1 - break - ;; - 2) - pacman -S xfce4 --noconfirm - instentorno=1 - break - ;; - 3) - pacman -S cinnamon --noconfirm - instentorno=1 - break - ;; - 4) - pacman -S gnome --noconfirm - instentorno=1 - break - ;; - 5) - pacman -S plasma --noconfirm - pacman -R plasma-mediacenter ksshaskpass --noconfirm - instentorno=1 - break - ;; - 6) - break - ;; -esac