From 479be1c21e6bce32957c55f3fee99a060d973d59 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 27 Sep 2015 12:32:28 +0300 Subject: [PATCH 1/3] installer: clean up misleading message --- packages/tools/installer/scripts/installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 0ddf8c6475..7d1c8fae82 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -514,7 +514,7 @@ msg_oem_only() { msg_no_device() { # show a warning dialog if we dont find not mounted devices for install and return to main menu MSG_TITLE="\Z1[ WARNING ]\Zn" - MSG_INFOBOX=" No devices were found. \n If you are trying to install on a brand new harddisk you must \n create atleast one partition. \n Otherwise it won't be found. \n If you dont know how, ask in the forum or on IRC." + MSG_INFOBOX=" No devices were found. " dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 9 70 From cbd56c11f0f2cc5f76d747756987de1a0b81aabb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 27 Sep 2015 12:33:33 +0300 Subject: [PATCH 2/3] installer: cleanup dead code --- packages/tools/installer/scripts/installer | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 7d1c8fae82..5b83ab246a 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -495,22 +495,6 @@ do_install_custom() { esac } -msg_not_implemented() { - # show a dialog that this function is not yet implemented - MSG_TITLE="\Z2[ WORK IN PROGRESS ]\Zn" - MSG_INFOBOX=" This function is not implemented yet." - - dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70 -} - -msg_oem_only() { - # show a dialog that this function is only implemented on special builds - MSG_TITLE="\Z2[ FOR OEM ONLY ]\Zn" - MSG_INFOBOX=" OEM only feature, this function is not implemented in this build. \n if you have questions about this feature \n visit http://www.openelec.tv" - - dialog --colors --backtitle "$BACKTITLE" --title "$MSG_TITLE" --msgbox "$MSG_INFOBOX" 7 70 -} - msg_no_device() { # show a warning dialog if we dont find not mounted devices for install and return to main menu MSG_TITLE="\Z1[ WARNING ]\Zn" From 7901a7561c267af2623232819de1d44bb2717937 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 27 Sep 2015 20:06:44 +0300 Subject: [PATCH 3/3] installer: cosmetics --- packages/tools/installer/scripts/installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tools/installer/scripts/installer b/packages/tools/installer/scripts/installer index 5b83ab246a..8c029381be 100755 --- a/packages/tools/installer/scripts/installer +++ b/packages/tools/installer/scripts/installer @@ -70,7 +70,7 @@ get_device_unmount() { # provides: DEVICES DEVICES="" - DEVICES=$(parted -s -m -l | grep -E '^/dev/sd|^/dev/mmcblk|^/dev/nvme' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":") + DEVICES=$(parted -s -m -l 2>/dev/null | grep -E '^/dev/sd|^/dev/mmcblk|^/dev/nvme' | grep -E -v '.?rpmb|.?boot?' | cut -f1 -d ":") for i in $(cat /proc/mounts | grep -E '^/dev/sd' | cut -f1 -d " " | sed "s/[0-9].*$//"); do DEVICES=$(echo $DEVICES |sed -e "s|$i||")