From e53427eeb9d9762672fc6ce124d57efd9586b682 Mon Sep 17 00:00:00 2001 From: simono41 Date: Sat, 10 Mar 2018 22:13:56 +0100 Subject: [PATCH] conky --- arch-graphical-install-auto | 43 +++++++++++++++++++++++++++++++------ packages_cinnamon.txt | 2 ++ packages_gnome.txt | 2 ++ packages_kde.txt | 2 ++ packages_libre.txt | 2 ++ packages_lxde.txt | 2 ++ packages_lxqt.txt | 2 ++ packages_mate.txt | 2 ++ packages_voll.txt | 2 ++ packages_xfce4.txt | 2 ++ 10 files changed, 55 insertions(+), 6 deletions(-) diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto index 87f9196..c7cff81 100755 --- a/arch-graphical-install-auto +++ b/arch-graphical-install-auto @@ -27,17 +27,20 @@ userpass="$3" [[ -z "${userpass}" ]] && userpass="user1" function gitclone() { - cd /opt/ if [ -d "${repo}" ]; then echo "${repo} existiert bereits!!!" - rm -Rv ${repo} + cd /opt/${repo} + git pull + else + git clone ${WEBADDRESS} fi - git clone ${WEBADDRESS} if [ -d "${repo1}" ]; then echo "${repo1} existiert bereits!!!" - rm -Rv ${repo1} + cd /opt/${repo1} + git pull + else + git clone ${WEBADDRESS1} fi - git clone ${WEBADDRESS1} cd / } @@ -310,7 +313,6 @@ EOT pwd fi yaourtinstall pamac-aur - yaourtinstall conky-lua-nv fi fi @@ -443,6 +445,8 @@ if [ "${vollinstallation}" != "n" ]; then # pip install beautysh if [ -d /opt/beautysh ];then echo "Bereits vorhanden!!!" + cd /opt/beautysh + git pull else git clone https://github.com/bemeurer/beautysh /opt/beautysh fi @@ -461,6 +465,8 @@ if [ "${vollinstallation}" != "n" ]; then # powerline-shell-fonts if [ -d /opt/powerline-shell-fonts ];then echo "Bereits vorhanden!!!" + cd /opt/powerline-shell-fonts + git pull else git clone https://github.com/powerline/fonts.git /opt/powerline-shell-fonts fi @@ -471,6 +477,8 @@ if [ "${vollinstallation}" != "n" ]; then # uncrustify if [ -d /opt/uncrustify ];then echo "Bereits vorhanden!!!" + cd /opt/uncrustify + git pull else git clone https://github.com/uncrustify/uncrustify.git /opt/uncrustify fi @@ -487,6 +495,29 @@ if [ "${vollinstallation}" != "n" ]; then chmod +x /usr/bin/uncrustify cd / + # conky + if [ -d /opt/conky ];then + echo "Bereits vorhanden!!!" + cd /opt/conky + git pull + else + git clone https://github.com/brndnmtthws/conky.git /opt/conky + fi + cd /opt/conky + cp cmake/ConkyBuildOptions.cmake . + + sed "s|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" false)|option(BUILD_LUA_CAIRO \"Build cairo bindings for Lua\" true)|g; + s|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" false)|option(BUILD_LUA_IMLIB2 \"Build Imlib2 bindings for Lua\" true)|g; + s|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" false)|option(BUILD_LUA_RSVG \"Build rsvg bindings for Lua\" true)|g" ConkyBuildOptions.cmake > cmake/ConkyBuildOptions.cmake + + mkdir -p build + cd build + cmake .. + make + make install + + cd / + # iso_name if [ "${version}" == "libre" ]; then echo "${repo}-libre" > /etc/hostname diff --git a/packages_cinnamon.txt b/packages_cinnamon.txt index 8d6a96f..7ccd264 100755 --- a/packages_cinnamon.txt +++ b/packages_cinnamon.txt @@ -72,6 +72,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mesa-vdpau minetest mkinitcpio-nfs-utils @@ -116,6 +117,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_gnome.txt b/packages_gnome.txt index 3cb4961..4adff75 100755 --- a/packages_gnome.txt +++ b/packages_gnome.txt @@ -71,6 +71,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mesa-vdpau minetest mkinitcpio-nfs-utils @@ -115,6 +116,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_kde.txt b/packages_kde.txt index 064227f..7eb1690 100755 --- a/packages_kde.txt +++ b/packages_kde.txt @@ -69,6 +69,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mesa-vdpau minetest mkinitcpio-nfs-utils @@ -115,6 +116,7 @@ telepathy-morse thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_libre.txt b/packages_libre.txt index fa888a6..2758a86 100644 --- a/packages_libre.txt +++ b/packages_libre.txt @@ -60,6 +60,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mesa-vdpau minetest mkinitcpio-nfs-utils @@ -94,6 +95,7 @@ tar teeworlds telegram-desktop tigervnc +tolua++ transmission-gtk vlc wget diff --git a/packages_lxde.txt b/packages_lxde.txt index fc76244..edf3c22 100755 --- a/packages_lxde.txt +++ b/packages_lxde.txt @@ -66,6 +66,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 lxde-gtk3 mesa-vdpau minetest @@ -111,6 +112,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_lxqt.txt b/packages_lxqt.txt index e0d45e1..746c7ac 100755 --- a/packages_lxqt.txt +++ b/packages_lxqt.txt @@ -67,6 +67,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 lxqt lxqt-powermanagement mesa-vdpau @@ -114,6 +115,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_mate.txt b/packages_mate.txt index 7e328fa..b7cc916 100755 --- a/packages_mate.txt +++ b/packages_mate.txt @@ -66,6 +66,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mate mate-extra mate-power-manager @@ -113,6 +114,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation diff --git a/packages_voll.txt b/packages_voll.txt index 676ad9b..63a118b 100755 --- a/packages_voll.txt +++ b/packages_voll.txt @@ -100,6 +100,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 lxde lxqt lxqt-powermanagement @@ -172,6 +173,7 @@ telepathy-morse thunderbird thunderbird-i18n-de tigervnc +tolua++ traceroute transmission-gtk ttf-dejavu diff --git a/packages_xfce4.txt b/packages_xfce4.txt index 81c4a01..b47fe68 100755 --- a/packages_xfce4.txt +++ b/packages_xfce4.txt @@ -66,6 +66,7 @@ libva-mesa-driver libva-vdpau-driver libvdpau-va-gl links +lua51 mesa-vdpau minetest mkinitcpio-nfs-utils @@ -110,6 +111,7 @@ telegram-desktop thunderbird thunderbird-i18n-de tigervnc +tolua++ transmission-gtk ttf-dejavu ttf-liberation