From a27836163043148fff01b0e65aab5298650d8951 Mon Sep 17 00:00:00 2001 From: Adel Kara Slimane Date: Mon, 10 Aug 2020 12:13:17 +0200 Subject: [PATCH] linux57: extra changes to Ubuntu install script that have been forgotten (#41) * linux57: customization.cfg: make custom_gcc_path apply to ubuntu * linux57: install.sh: remove unneeded variable * linux57: install.sh: uncomment kernel uninstall command line --- linux57-tkg/customization.cfg | 2 +- linux57-tkg/install.sh | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/linux57-tkg/customization.cfg b/linux57-tkg/customization.cfg index c7e450b..c0cffcc 100644 --- a/linux57-tkg/customization.cfg +++ b/linux57-tkg/customization.cfg @@ -12,7 +12,7 @@ _EXT_CONFIG_PATH=~/.config/frogminer/linux57-tkg.cfg # Default is "true". _NUKR="true" -# [Arch specific] Custom compiler root dirs - Leave empty to use system compilers +# Custom compiler root dirs - Leave empty to use system compilers # Example: CUSTOM_GCC_PATH="/home/frog/PKGBUILDS/mostlyportable-gcc/gcc-mostlyportable-9.2.0" CUSTOM_GCC_PATH="" diff --git a/linux57-tkg/install.sh b/linux57-tkg/install.sh index 0ddcd6e..fe78b58 100755 --- a/linux57-tkg/install.sh +++ b/linux57-tkg/install.sh @@ -19,8 +19,6 @@ plain() { # alias plain=echo set -e -# Variable to know if the user command has been recognised -_command_recognised=0 _where=`pwd` srcdir="$_where" @@ -64,8 +62,6 @@ if [ "$1" == "install" ] || [ "$1" == "config" ]; then _distro="" fi - _command_recognised=1 - if [ -d linux-${_basekernel}.orig ]; then rm -rf linux-${_basekernel}.orig fi @@ -118,8 +114,6 @@ fi if [ "$1" == "install" ]; then - _command_recognised=1 - # Use custom compiler paths if defined if [ -n "${CUSTOM_GCC_PATH}" ]; then PATH=${CUSTOM_GCC_PATH}/bin:${CUSTOM_GCC_PATH}/lib:${CUSTOM_GCC_PATH}/include:${PATH} @@ -171,7 +165,6 @@ if [ "$1" == "install" ]; then fi if [ "$1" == "uninstall" ]; then - _command_recognised=1 cd "$_where" @@ -195,7 +188,7 @@ if [ "$1" == "uninstall" ]; then if [ $_delete_index -ge 1 ] && [ $_delete_index -le $i ]; then _delete_index=$((_delete_index-1)) - # sudo dpkg -r linux-headers-${_custom_kernels[$_delete_index]} linux-image-${_custom_kernels[$_delete_index]} + sudo dpkg -r linux-headers-${_custom_kernels[$_delete_index]} linux-image-${_custom_kernels[$_delete_index]} fi rm -f installed-kernels