g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Read user input properly in linux_install.sh for Gentoo (#4395) 

* Change spaces to tabs on two lines

The rest of the file uses tabs

* Read user input in a non-terrible, non-hacky way

* Remove unnecessary tee call

* read -p is not POSIX

* Add missing $ to echo GENTOO_WARNING

* Replace non-POSIX echo -n with printf

* Use cd ... || exit 1 in case git clone fails

* Add missing sudo

Thanks @snortwolf

* Undo replacing tee with >>
master
Konstantin Đorđević 2018-12-26 17:01:26 +01:00 committed by Drashna Jaelre
parent b7d2a9f980
commit 0c1256e60a
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/linux_install.sh
View File

@ -32,7 +32,7 @@ if grep ID /etc/os-release | grep -qE "fedora"; then
elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then elif grep ID /etc/os-release | grep -qE 'debian|ubuntu'; then
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
DEBCONF_NONINTERACTIVE_SEEN=true DEBCONF_NONINTERACTIVE_SEEN=true
export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
sudo apt-get update sudo apt-get update
sudo apt-get install \ sudo apt-get install \
build-essential \ build-essential \
@ -70,20 +70,18 @@ elif grep ID /etc/os-release | grep -q 'arch\|manjaro'; then
wget \ wget \
zip zip
git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer git clone https://aur.archlinux.org/dfu-programmer.git /tmp/dfu-programmer
cd /tmp/dfu-programmer cd /tmp/dfu-programmer || exit 1
makepkg -sic makepkg -sic
rm -rf /tmp/dfu-programmer/ rm -rf /tmp/dfu-programmer/
elif grep ID /etc/os-release | grep -q gentoo; then elif grep ID /etc/os-release | grep -q gentoo; then
echo GENTOO_WARNING | fmt echo "$GENTOO_WARNING" | fmt
echo -n "Proceed (y/N)? " printf "\nProceed (y/N)? "
old_stty_cfg=$(stty -g) read -r answer
stty raw -echo if echo "$answer" | grep -iq "^y"; then
answer=$( while ! head -c 1 | grep -i '[ny]' ;do true ;done )
stty $old_stty_cfg
if echo "$answer" | grep -iq "^y" ;then
sudo touch /etc/portage/package.use/qmkfirmware sudo touch /etc/portage/package.use/qmkfirmware
echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware > /dev/null # tee is used here since sudo doesn't apply to >>
echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
sudo emerge -auN \ sudo emerge -auN \
app-arch/unzip \ app-arch/unzip \
app-arch/zip \ app-arch/zip \