diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto index 7afe22d..1c3c6ba 100755 --- a/arch-graphical-install-auto +++ b/arch-graphical-install-auto @@ -568,16 +568,16 @@ if [ "${vollinstallation}" != "n" ]; then chmod 755 /usr/bin/write_cowspace # installer-/usr/bin/ - if [ "${version}" == "libre" ]; then - 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 + sed "s|%VERSION%|${version}|g;" /opt/${repo}/arch-install > /usr/bin/arch-install chmod 755 /usr/bin/arch-install # installer 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 # install-picture diff --git a/arch-install b/arch-install index 11783d4..494dde3 100755 --- a/arch-install +++ b/arch-install @@ -15,7 +15,7 @@ fi if [ "$2" == "libre" ]; then echo "Libre mode Enabled!!!" - version="-libre" + version="libre" fi if [[ $EUID -ne 0 ]]; then @@ -339,7 +339,7 @@ function installation { fi #hostname - echo "${repo}${version}" > ${mountpoint}/etc/hostname + echo "${repo}-${version}" > ${mountpoint}/etc/hostname if [ "${usbsecret}" == "y" ]; then usbsecret @@ -968,7 +968,7 @@ then fi echo "installation" installation - arch-chroot ${mountpoint} mkinitcpio -p linux${version} + arch-chroot ${mountpoint} mkinitcpio -p linux-${version} echo "" if [ "${boot}" == "grub" ] then @@ -1012,7 +1012,7 @@ if [ "${update}" != "n" ] && [ "${offline}" == "n" ] || [ "${installationfehler} if [ "$graphical" != "n" ] then 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 else arch-chroot ${mountpoint} /root/arch-graphical-install-auto voll diff --git a/arch-install-libre.desktop b/arch-install-libre.desktop new file mode 100755 index 0000000..e633893 --- /dev/null +++ b/arch-install-libre.desktop @@ -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=