From 3042820d678d97b905b4a75bd1f79d68b99b55bb Mon Sep 17 00:00:00 2001 From: paperbenni Date: Tue, 31 Dec 2019 15:37:33 +0100 Subject: [PATCH] split up install and depend.sh --- depend.sh | 107 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ dotinstall.sh | 19 +++++++++++ install.sh | 104 -------------------------------------------------------- 3 files changed, 126 insertions(+), 104 deletions(-) create mode 100644 depend.sh diff --git a/depend.sh b/depend.sh new file mode 100644 index 0000000..e74ffd7 --- /dev/null +++ b/depend.sh @@ -0,0 +1,107 @@ +#!/bin/bash + +# installs dependencies for paperbenni suckless + +LINK="https://raw.githubusercontent.com/paperbenni/suckless/master" + +if cat /etc/os-release | grep -iq 'name.*arch' || + cat /etc/os-release | grep -iq 'name.*manjaro'; then + pacinstall() { + for i in "$@"; do + { pacman -iQ "$i" || command -v "$i" &>/dev/null; } &>/dev/null && continue + sudo pacman -S --noconfirm "$i" + done + } + echo "setting up arch specific stuff" + + sudo pacman -Syu --noconfirm + + # utilities + pacinstall picom + pacinstall rofi + pacinstall dunst + + pacinstall bash dash tmux + pacinstall dialog + pacinstall wget slop + pacinstall acpi + pacinstall cpio + + aptinstall git + aptinstall subversion + + pacinstall ffmpeg + pacinstall feh + pacinstall mpv + + pacinstall wmctrl + pacinstall xdotool + pacinstall xrandr + pacinstall xorg-xsetroot + + pacinstall conky + pacinstall ranger + pacinstall fzf + pacinstall sl + + pacinstall xorg-fonts-misc + pacinstall lxappearance + + if ! command -v panther_launcher; then + wget "https://www.rastersoft.com/descargas/panther_launcher/panther_launcher-1.12.0-1-x86_64.pkg.tar.xz" + sudo pacman -U --noconfirm panther_launcher*.pkg.tar.xz + rm panther_launcher*.pkg.tar.xz + fi + +fi + +# ubuntu specific stuff +if grep -iq 'name.*ubuntu' /dev/null; } &>/dev/null && continue + sudo apt-get install -y "$i" + done + } + + aptinstall compton + + aptinstall git + aptinstall subversion + + aptinstall bash dash tmux + aptinstall dialog + aptinstall wget + + aptinstall slop + aptinstall rofi + aptinstall dunst + + aptinstall acpi + aptinstall xrandr + aptinstall x11-xserver-utils + + aptinstall ffmpeg + aptinstall feh + aptinstall mpv + + aptinstall cpio + + aptinstall fzf + aptinstall ranger + aptinstall conky + aptinstall sl + + aptinstall lxappearance + + if ! command -v panther_launcher; then + wget "https://www.rastersoft.com/descargas/panther_launcher/panther-launcher-xenial_1.12.0-ubuntu1_amd64.deb" + sudo dpkg -i panther-launcher*.deb + sudo apt-get install -fy + rm panther-launcher*.deb + fi +fi diff --git a/dotinstall.sh b/dotinstall.sh index 1c938e4..91d8e43 100755 --- a/dotinstall.sh +++ b/dotinstall.sh @@ -1,4 +1,23 @@ #!/bin/bash +# central installer script for pb suckless + +if cat /etc/os-release | grep -Eiq 'name.*(arch|manjaro|ubuntu)'; then + echo " + ___. __ .__ +______\_ |__ ________ __ ____ | | _| | ____ ______ ______ +\____ \| __ \ / ___/ | \_/ ___\| |/ / | _/ __ \ / ___// ___/ +| |_> > \_\ \ \___ \| | /\ \___| <| |_\ ___/ \___ \ \___ \ +| __/|___ / /____ >____/ \___ >__|_ \____/\___ >____ >____ > +|__| \/ \/ \/ \/ \/ \/ \/ +" +else + echo "distro not supported" + echo "supported are: Arch, Manjaro, Ubuntu" + exit +fi + +echo "installing dependencies" +curl -s https://raw.githubusercontent.com/paperbenni/dotfiles/master/install.sh | bash echo "installing dotfiles" curl -s https://raw.githubusercontent.com/paperbenni/dotfiles/master/install.sh | bash echo "installing suckless tools" diff --git a/install.sh b/install.sh index 30d56e6..c3882d2 100755 --- a/install.sh +++ b/install.sh @@ -13,110 +13,6 @@ pb git LINK="https://raw.githubusercontent.com/paperbenni/suckless/master" -cat /etc/os-release | grep -Eiq 'name.*(arch|manjaro|ubuntu)' || exit - -if cat /etc/os-release | grep -iq 'name.*arch' || - cat /etc/os-release | grep -iq 'name.*manjaro'; then - pacinstall() { - for i in "$@"; do - { pacman -iQ "$i" || command -v "$i" &>/dev/null; } &>/dev/null && continue - sudo pacman -S --noconfirm "$i" - done - } - echo "setting up arch specific stuff" - - sudo pacman -Syu --noconfirm - - # utilities - pacinstall picom - pacinstall rofi - pacinstall dunst - - pacinstall bash dash tmux - pacinstall dialog - pacinstall wget slop - pacinstall acpi - pacinstall cpio - - aptinstall git - aptinstall subversion - - pacinstall ffmpeg - pacinstall feh - pacinstall mpv - - pacinstall wmctrl - pacinstall xdotool - pacinstall xrandr - pacinstall xorg-xsetroot - - pacinstall conky - pacinstall ranger - pacinstall fzf - pacinstall sl - - pacinstall xorg-fonts-misc - pacinstall lxappearance - - if ! command -v panther_launcher; then - wget "https://www.rastersoft.com/descargas/panther_launcher/panther_launcher-1.12.0-1-x86_64.pkg.tar.xz" - sudo pacman -U --noconfirm panther_launcher*.pkg.tar.xz - rm panther_launcher*.pkg.tar.xz - fi - -fi - -# ubuntu specific stuff -if grep -iq 'name.*ubuntu' /dev/null; } &>/dev/null && continue - sudo apt-get install -y "$i" - done - } - - aptinstall compton - - aptinstall git - aptinstall subversion - - aptinstall bash dash tmux - aptinstall dialog - aptinstall wget - - aptinstall slop - aptinstall rofi - aptinstall dunst - - aptinstall acpi - aptinstall xrandr - aptinstall x11-xserver-utils - - aptinstall ffmpeg - aptinstall feh - aptinstall mpv - - aptinstall cpio - - aptinstall fzf - aptinstall ranger - aptinstall conky - aptinstall sl - - aptinstall lxappearance - - if ! command -v panther_launcher; then - wget "https://www.rastersoft.com/descargas/panther_launcher/panther-launcher-xenial_1.12.0-ubuntu1_amd64.deb" - sudo dpkg -i panther-launcher*.deb - sudo apt-get install -fy - rm panther-launcher*.deb - fi -fi - gprogram() { wget "https://raw.githubusercontent.com/paperbenni/suckless/master/programs/$1" usrbin -f "$1" -- 2.11.0