diff options
| author | Enno Boland <g@s01.de> | 2018-03-26 09:49:43 +0200 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2018-06-22 19:32:00 +0200 |
| commit | cef9bdd0d7fe3b7b1fc3d4b4651c438d8bd51f92 (patch) | |
| tree | 9cbc52a2bf703057e50ab4340650611cf2a9d2a7 | |
| parent | 7c53d32c7c0f6d55767ead43866af7bef13b3ff6 (diff) | |
| download | hrmpf-cef9bdd0d7fe3b7b1fc3d4b4651c438d8bd51f92.tar.gz hrmpf-cef9bdd0d7fe3b7b1fc3d4b4651c438d8bd51f92.tar.xz hrmpf-cef9bdd0d7fe3b7b1fc3d4b4651c438d8bd51f92.zip | |
do not offer locale option on musl
fixes #152
| -rw-r--r-- | installer.sh.in | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/installer.sh.in b/installer.sh.in index 40b0074..e9b9afa 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -1333,23 +1333,42 @@ menu() { DEFITEM="Keyboard" fi - DIALOG --default-item $DEFITEM \ - --extra-button --extra-label "Settings" \ - --title " Void Linux installation menu " \ - --menu "$MENULABEL" 10 70 0 \ - "Keyboard" "Set system keyboard" \ - "Network" "Set up the network" \ - "Source" "Set source installation" \ - "Hostname" "Set system hostname" \ - "Locale" "Set system locale" \ - "Timezone" "Set system time zone" \ - "RootPassword" "Set system root password" \ - "UserAccount" "Set primary user name and password" \ - "BootLoader" "Set disk to install bootloader" \ - "Partition" "Partition disk(s)" \ - "Filesystems" "Configure filesystems and mount points" \ - "Install" "Start installation with saved settings" \ - "Exit" "Exit installation" + if xbps-uhelper arch | grep '-musl$'; then + DIALOG --default-item $DEFITEM \ + --extra-button --extra-label "Settings" \ + --title " Void Linux installation menu " \ + --menu "$MENULABEL" 10 70 0 \ + "Keyboard" "Set system keyboard" \ + "Network" "Set up the network" \ + "Source" "Set source installation" \ + "Hostname" "Set system hostname" \ + "Timezone" "Set system time zone" \ + "RootPassword" "Set system root password" \ + "UserAccount" "Set primary user name and password" \ + "BootLoader" "Set disk to install bootloader" \ + "Partition" "Partition disk(s)" \ + "Filesystems" "Configure filesystems and mount points" \ + "Install" "Start installation with saved settings" \ + "Exit" "Exit installation" + else + DIALOG --default-item $DEFITEM \ + --extra-button --extra-label "Settings" \ + --title " Void Linux installation menu " \ + --menu "$MENULABEL" 10 70 0 \ + "Keyboard" "Set system keyboard" \ + "Network" "Set up the network" \ + "Source" "Set source installation" \ + "Hostname" "Set system hostname" \ + "Locale" "Set system locale" \ + "Timezone" "Set system time zone" \ + "RootPassword" "Set system root password" \ + "UserAccount" "Set primary user name and password" \ + "BootLoader" "Set disk to install bootloader" \ + "Partition" "Partition disk(s)" \ + "Filesystems" "Configure filesystems and mount points" \ + "Install" "Start installation with saved settings" \ + "Exit" "Exit installation" + fi if [ $? -eq 3 ]; then # Show settings |