This commit is contained in:
simono41 2018-03-10 22:13:56 +01:00
parent f48e0beb64
commit e53427eeb9
10 changed files with 55 additions and 6 deletions

View file

@ -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}
fi
cd /opt/${repo}
git pull
else
git clone ${WEBADDRESS}
fi
if [ -d "${repo1}" ]; then
echo "${repo1} existiert bereits!!!"
rm -Rv ${repo1}
fi
cd /opt/${repo1}
git pull
else
git clone ${WEBADDRESS1}
fi
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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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