Add support for ubuntu 18.04

master
Hugo Thunnissen 6 years ago
parent e4e7062ac2
commit 110014b17e

@ -1 +1 @@
export PATH="$HOME/.local/share/clopper-ob/bin:$HOME/.local/share/clopper-ob/notify-send.sh:$PATH" export PATH="$HOME/.local/share/clopper-ob/bin:$HOME/.local/share/clopper-ob/applications/notify-send.sh:$PATH"

@ -22,7 +22,8 @@ install-apt-dependencies() {
dunst \ dunst \
numix-icon-theme-circle \ numix-icon-theme-circle \
vorbis-tools \ vorbis-tools \
sound-theme-freedesktop sound-theme-freedesktop \
terminator
set +x set +x
} }
@ -39,7 +40,7 @@ asset-dirs-exist() {
install-dependencies() { install-dependencies() {
echo "=> Checking dependencies" echo "=> Checking dependencies"
if ! are-in-path xcompmgr openbox dunst ogg123 || ! asset-dirs-exist; then if ! are-in-path xcompmgr openbox dunst ogg123 terminator || ! asset-dirs-exist; then
install-apt-dependencies install-apt-dependencies
fi fi
@ -47,7 +48,7 @@ install-dependencies() {
notify_send_dir="$(local-dir)/applications/notify-send.sh" notify_send_dir="$(local-dir)/applications/notify-send.sh"
if ! [[ -d "$notify_send_dir" ]]; then if ! [[ -d "$notify_send_dir" ]]; then
mkdir -p "$notify_send_dir" mkdir -p "$notify_send_dir"
git clone git@github.com:vlevit/notify-send.sh.git "$notify_send_dir" git clone git@github.com:vlevit/notify-send.sh.git "$notify_send_dir" || rm "$notify_send_dir"
fi fi
} }
@ -93,21 +94,35 @@ add-custom-startup() {
} }
ppa-has-been-added() { ppa-has-been-added() {
declare ppa="$1" declare -r ppa="$1"
grep -q "^deb .*$ppa" /etc/apt/sources.list /etc/apt/sources.list.d/*
if [[ $ppa == ppa:* ]]; then
ppa-has-been-added "${ppa#ppa:}"
return $?
fi
grep -q "$ppa" /etc/apt/sources.list /etc/apt/sources.list.d/*
} }
add-ppa-if-not-added() { add-ppa-if-not-added() {
declare ppa="$1" declare ppa="$1"
if ! ppa-has-been-added "$ppa"; then if ! ppa-has-been-added "$ppa"; then
printf 'Adding ppa "%s"\n' "$ppa" printf 'Adding ppa "%s"\n' "$ppa"
sudo add-apt-repository "ppa:$ppa" sudo add-apt-repository "$ppa"
fi fi
} }
os-is-ubuntu-1804() {
[[ $(cat /etc/os-release | grep VERSION_ID | grep -qPo '(?<=").*(?=")') == '18.04' ]]
}
add-ppas() { add-ppas() {
add-ppa-if-not-added 'nilarimogard/webupd8' if os-is-ubuntu-1804; then
add-ppa-if-not-added 'numix/ppa' add-ppa-if-not-added 'deb http://download.opensuse.org/repositories/home:/manuelschneid3r/xUbuntu_18.04/ /'
else
add-ppa-if-not-added 'ppa:nilarimogard/webupd8'
fi
add-ppa-if-not-added 'ppa:numix/ppa'
} }
cache-dir() { cache-dir() {

Loading…
Cancel
Save