simono41/SpectreOS-old
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix

Browse source
This commit is contained in:
simono41 2018-07-31 07:58:36 +02:00
parent 14c986b417
commit 98bb0a3ec6
1 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
arch-install
View file

@ -8,32 +8,12 @@ WEBADDRESS="ssh://git@5.83.162.84:22/home/git/SpectreOS"
repo="SpectreOS" repo="SpectreOS"
user="user1" user="user1"
version="${2}"
hostname="$(cat /etc/hostname)" hostname="$(cat /etc/hostname)"
[[ -z "${version}" ]] && version="${hostname#*-}" [[ -z "${version}" ]] && version="${hostname#*-}"
#fastinstall arch-install fastinstall ${version} ${name} ${Partition} ${device} ${dateisystem} ${swap} ${swapspeicher} ${swapverschluesselung} ${offline} ${autodiskdevice} ${autostart} ${extraparameter} #fastinstall arch-install fastinstall ${version} ${name} ${Partition} ${device} ${dateisystem} ${swap} ${swapspeicher} ${swapverschluesselung} ${offline} ${autodiskdevice} ${autostart} ${extraparameter}
if [ "${1}" == "fastinstall" ]; then
# while-schleife
while (( "$#" ))
do
echo ${1}
export ${1}="y"
startparameter="${startparameter}${1} "
shift
done
fi
if [ "${1}" == "fastinstallnext" ]; then
# for-schleife
for wort in ${3}
do
echo "$wort"
export ${wort%=*}=${wort#*=}
echo "Parameter ${wort%=*} = ${wort#*=}"
done
fi
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
echo "This script must be run as root" 1>&2 echo "This script must be run as root" 1>&2
@ -50,6 +30,16 @@ if [[ $EUID -ne 0 ]]; then
fi fi
echo "Logged in as root" echo "Logged in as root"
if ! [ -z "${2}" ]; then
while (( "$#" ))
do
echo ${1}
export ${1}="y"
startparameter="${startparameter}${1} "
shift
done
fi
function minimalinstallation() { function minimalinstallation() {
if [ -f base.txt ]; then if [ -f base.txt ]; then
@ -863,7 +853,7 @@ function abfrage() {
# Lade Deutsches Tastaturlayout # Lade Deutsches Tastaturlayout
loadkeys de loadkeys de
if [ "${1}" == "fastinstallnext" ]; then if [ "${fastinstallnext}" == "y" ]; then
[[ -z "${name}" ]] && name=arch-linux [[ -z "${name}" ]] && name=arch-linux
@ -1175,7 +1165,6 @@ function abfrage() {
# for-schleife # for-schleife
for wort in ${1} for wort in ${1}
do do
@ -1184,11 +1173,11 @@ do
echo "Parameter ${wort%=*} = ${wort#*=}" echo "Parameter ${wort%=*} = ${wort#*=}"
done done
if [ "${1}" == "fastinstall" ]; then if [ "${fastinstall}" == "y" ]; then
gitclone gitclone
/opt/${repo}/arch-install fastinstallnext ${version} "${startparameter}" /opt/${repo}/arch-install "${startparameter}fastinstallnext=y "
exit 0 exit 0
elif [ "${phaseone}" != "n" ] elif [ "${phaseone}" != "n" ] && [ "${fastinstallnext}" != "y" ]
then then
if wget -qO- ipv4.icanhazip.com 1>/dev/null 2>&1; then if wget -qO- ipv4.icanhazip.com 1>/dev/null 2>&1; then
read -p "Should I look at the internet for a new install script and then run it ?: [Y/n] " update read -p "Should I look at the internet for a new install script and then run it ?: [Y/n] " update