jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-14 17:21:32 +01:00
Code Issues Releases Wiki Activity

Fixing things...

Browse Source
This commit is contained in:
JKA Network
2017-01-16 17:17:22 +01:00
parent 3ba9b67dda
commit c7e3c893b0
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ISOCreateScripts/depsjkarch.sh
View File

@@ -15,7 +15,7 @@ mkdir trydeps
pacstrap -d trydeps pacman jkarch-mirrorlist pacstrap -d trydeps pacman jkarch-mirrorlist
cp /etc/pacman.conf trydeps/etc/pacman.conf cp /etc/pacman.conf trydeps/etc/pacman.conf
arch-chroot trydeps/ /usr/bin/pacman -Sw base base-devel yaourt btrfs-progs exfat-utils jkarch-mirrorlist jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools \ arch-chroot trydeps/ /usr/bin/pacman -Sw base base-devel yaourt btrfs-progs rsync exfat-utils jkarch-mirrorlist jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools \
ntfs-3g bash-completion reflector ntp \ ntfs-3g bash-completion reflector ntp \
mesa libva-vdpau-driver mesa-libgl libva-mesa-driver mesa-vdpau libva-intel-driver libvdpau-va-gl virtualbox-guest-utils virtualbox-guest-modules-arch xf86-input-vmmouse open-vm-tools \ mesa libva-vdpau-driver mesa-libgl libva-mesa-driver mesa-vdpau libva-intel-driver libvdpau-va-gl virtualbox-guest-utils virtualbox-guest-modules-arch xf86-input-vmmouse open-vm-tools \
firefox google-chrome chromium opera otter-browser flashplugin \ firefox google-chrome chromium opera otter-browser flashplugin \

14
archinstall/archinstall-dev.sh
View File

@@ -595,7 +595,7 @@ function installconf {
fi fi
if [[ $isoffline = "1" ]];then if [[ $isoffline = "1" ]];then
tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9 tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9
execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers execl pacstrap -C pacman-offline.conf /mnt/ base jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers
mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location
fi fi
@@ -615,7 +615,7 @@ function installconf {
fi fi
# Create bind mountpoints for the rest of the install (Chroot) # Create bind mountpoints for the rest of the install (Chroot)
if [[ $isoffline = 0 ]];then if [[ $isoffline = "0" ]];then
cp -r /etc/netctl/* /mnt/etc/netctl/ cp -r /etc/netctl/* /mnt/etc/netctl/
cp -f /etc/resolv.conf /mnt/etc/resolv.conf cp -f /etc/resolv.conf /mnt/etc/resolv.conf
fi fi
@@ -637,7 +637,7 @@ function installconf {
# Before install, configure mirrorlist if its online # Before install, configure mirrorlist if its online
if [[ $isoffline = 0 ]];then if [[ $isoffline = "0" ]];then
execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
fi fi
# Here, allpackages have the user selected packages because selected before. Then, install it # Here, allpackages have the user selected packages because selected before. Then, install it
@@ -720,14 +720,14 @@ function installconf {
# Configure wine if neccesary # Configure wine if neccesary
if [[ $inswine = 1 ]];then if [[ $inswine = "1" ]];then
echo "$(T "Configuring wine for better experience") (32 bit winearch)" echo "$(T "Configuring wine for better experience") (32 bit winearch)"
execl chuser WINEARCH=win32 wineboot -u execl chuser WINEARCH=win32 wineboot -u
fi fi
# Set X11 keyboard, and user GKSU, if there is any enviroment installed # Set X11 keyboard, and user GKSU, if there is any enviroment installed
if [[ $optentorno != 7 ]];then if [[ $optentorno != "7" ]];then
keyboardlayout keyboardlayout
# Modify gksu for ask user password and not root one # Modify gksu for ask user password and not root one
execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser) execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser)
@@ -853,7 +853,7 @@ function bootselect {
clear clear
mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")" mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")"
if [[ $isoffline=0 ]];then if [[ $isoffline = "0" ]];then
mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp"
else else
mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp"
@@ -971,7 +971,7 @@ installconf
otrasconfig otrasconfig
# Unmount and tweak pacman if necessary (If offline) # Unmount and tweak pacman if necessary (If offline)
if [[ $isoffline = 1 ]];then # Is an offline installation? if [[ $isoffline = "1" ]];then # Is an offline installation?
echo "Configurando pacman para usar servidores web en los siguientes arranques..." echo "Configurando pacman para usar servidores web en los siguientes arranques..."
mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf
fi fi

14
archinstall/archinstall.sh
View File

@@ -595,7 +595,7 @@ function installconf {
fi fi
if [[ $isoffline = "1" ]];then if [[ $isoffline = "1" ]];then
tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9 tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9
execl pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers execl pacstrap -C pacman-offline.conf /mnt/ base jkarch-mirrorlist rsync dosfstools ntfs-3g btrfs-progs exfat-utils #Install base and disk format drivers
mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location
fi fi
@@ -615,7 +615,7 @@ function installconf {
fi fi
# Create bind mountpoints for the rest of the install (Chroot) # Create bind mountpoints for the rest of the install (Chroot)
if [[ $isoffline = 0 ]];then if [[ $isoffline = "0" ]];then
cp -r /etc/netctl/* /mnt/etc/netctl/ cp -r /etc/netctl/* /mnt/etc/netctl/
cp -f /etc/resolv.conf /mnt/etc/resolv.conf cp -f /etc/resolv.conf /mnt/etc/resolv.conf
fi fi
@@ -637,7 +637,7 @@ function installconf {
# Before install, configure mirrorlist if its online # Before install, configure mirrorlist if its online
if [[ $isoffline = 0 ]];then if [[ $isoffline = "0" ]];then
execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist
fi fi
# Here, allpackages have the user selected packages because selected before. Then, install it # Here, allpackages have the user selected packages because selected before. Then, install it
@@ -720,14 +720,14 @@ function installconf {
# Configure wine if neccesary # Configure wine if neccesary
if [[ $inswine = 1 ]];then if [[ $inswine = "1" ]];then
echo "$(T "Configuring wine for better experience") (32 bit winearch)" echo "$(T "Configuring wine for better experience") (32 bit winearch)"
execl chuser WINEARCH=win32 wineboot -u execl chuser WINEARCH=win32 wineboot -u
fi fi
# Set X11 keyboard, and user GKSU, if there is any enviroment installed # Set X11 keyboard, and user GKSU, if there is any enviroment installed
if [[ $optentorno != 7 ]];then if [[ $optentorno != "7" ]];then
keyboardlayout keyboardlayout
# Modify gksu for ask user password and not root one # Modify gksu for ask user password and not root one
execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser) execl chuser gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser)
@@ -853,7 +853,7 @@ function bootselect {
clear clear
mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")" mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")"
if [[ $isoffline=0 ]];then if [[ $isoffline = "0" ]];then
mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, vuelva a probar en unas horas o con la versión offline.\nTambien podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp"
else else
mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp" mostrardialog "JKArch" "El script esta en estado beta y puede haber fallos. En caso de fallo, podeis mandarnos un correo a contacto@jkanetwork.com y usar el log guardado en /tmp"
@@ -971,7 +971,7 @@ installconf
otrasconfig otrasconfig
# Unmount and tweak pacman if necessary (If offline) # Unmount and tweak pacman if necessary (If offline)
if [[ $isoffline = 1 ]];then # Is an offline installation? if [[ $isoffline = "1" ]];then # Is an offline installation?
echo "Configurando pacman para usar servidores web en los siguientes arranques..." echo "Configurando pacman para usar servidores web en los siguientes arranques..."
mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf
fi fi