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

versions-fix

Browse source
This commit is contained in:
simono41 2018-03-25 19:38:39 +02:00
parent ab80c464fa
commit ae5f0b5f7f
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch-graphical-install-auto
View file

@ -553,11 +553,7 @@ if [ "${vollinstallation}" != "n" ]; then
cd / cd /
# iso_name # iso_name
if [ "${version}" == "libre" ]; then echo "${repo}-${version}" > /etc/hostname
echo "${repo}-libre" > /etc/hostname
else
echo ${repo} > /etc/hostname
fi
# uefi-boot # uefi-boot
cp /opt/${repo1}/uefi-boot.sh /usr/bin/uefi-boot cp /opt/${repo1}/uefi-boot.sh /usr/bin/uefi-boot
@ -568,16 +564,16 @@ if [ "${vollinstallation}" != "n" ]; then
chmod 755 /usr/bin/write_cowspace chmod 755 /usr/bin/write_cowspace
# installer-/usr/bin/ # installer-/usr/bin/
if [ "${version}" == "libre" ]; then sed "s|%VERSION%|${version}|g;" /opt/${repo}/arch-install > /usr/bin/arch-install
sed "s|%VERSION%|-libre|g;" /opt/${repo}/arch-install > /usr/bin/arch-install
else
sed "s|%VERSION%||g;" /opt/${repo}/arch-install > /usr/bin/arch-install
fi
chmod 755 /usr/bin/arch-install chmod 755 /usr/bin/arch-install
# installer # installer
mkdir -p /usr/share/applications/ mkdir -p /usr/share/applications/
cp /opt/${repo}/arch-install.desktop /usr/share/applications/ if [ "${version}" == "libre" ]; then
cp /opt/${repo}/arch-install-libre.desktop /usr/share/applications/arch-install.desktop
else
cp /opt/${repo}/arch-install.desktop /usr/share/applications/arch-install.desktop
fi
chmod 755 /usr/share/applications/arch-install.desktop chmod 755 /usr/share/applications/arch-install.desktop
# install-picture # install-picture

8
arch-install
View file

@ -15,7 +15,7 @@ fi
if [ "$2" == "libre" ]; then if [ "$2" == "libre" ]; then
echo "Libre mode Enabled!!!" echo "Libre mode Enabled!!!"
version="-libre" version="libre"
fi fi
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
@ -339,7 +339,7 @@ function installation {
fi fi
#hostname #hostname
echo "${repo}${version}" > ${mountpoint}/etc/hostname echo "${repo}-${version}" > ${mountpoint}/etc/hostname
if [ "${usbsecret}" == "y" ]; then if [ "${usbsecret}" == "y" ]; then
usbsecret usbsecret
@ -968,7 +968,7 @@ then
fi fi
echo "installation" echo "installation"
installation installation
arch-chroot ${mountpoint} mkinitcpio -p linux${version} arch-chroot ${mountpoint} mkinitcpio -p linux-${version}
echo "" echo ""
if [ "${boot}" == "grub" ] if [ "${boot}" == "grub" ]
then then
@ -1012,7 +1012,7 @@ if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ "${installationfehler}
if [ "$graphical" != "n" ] if [ "$graphical" != "n" ]
then then
cp /opt/${repo}/arch-graphical-install-auto ${mountpoint}/root/arch-graphical-install-auto cp /opt/${repo}/arch-graphical-install-auto ${mountpoint}/root/arch-graphical-install-auto
if [ "${version}" == "-libre" ]; then if [ "${version}" == "libre" ]; then
arch-chroot ${mountpoint} /root/arch-graphical-install-auto libre arch-chroot ${mountpoint} /root/arch-graphical-install-auto libre
else else
arch-chroot ${mountpoint} /root/arch-graphical-install-auto voll arch-chroot ${mountpoint} /root/arch-graphical-install-auto voll

11
arch-install-libre.desktop Executable file
View file

@ -0,0 +1,11 @@
[Desktop Entry]
Type=Application
Icon=/usr/share/pixmaps/install.png
Name[de]=Betriebssystem installieren
Name[en]=Install the operating system
Exec=/usr/bin/arch-install "" libre
Terminal=true
Categories=ConsoleOnly;System;
StartupNotify=false
Comment=
Path=