diff --git a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh index 351897005..8aa747a55 100755 --- a/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh +++ b/webtop_kde/rootfs/etc/cont-init.d/80-configuration.sh @@ -2,29 +2,19 @@ # shellcheck shell=bash # shellcheck disable=SC2015 -exit 0 - -# Add Edge repositories -if bashio::config.true 'edge_repositories'; then - bashio::log.info "Changing app repositories to edge" - { echo "https://dl-cdn.alpinelinux.org/alpine/edge/community"; - echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing"; - echo "https://dl-cdn.alpinelinux.org/alpine/edge/main"; } > /etc/apk/repositories -fi - # Install rpi video drivers -if bashio::config.true 'rpi_video_drivers'; then - bashio::log.info "Installing Rpi graphic drivers" - apk add --no-cache mesa-dri-vc4 mesa-dri-swrast mesa-gbm xf86-video-fbdev >/dev/null && bashio::log.green "... done" || - bashio::log.red "... not successful. Are you on a rpi?" -fi +#if bashio::config.true 'rpi_video_drivers'; then +# bashio::log.info "Installing Rpi graphic drivers" +# apk add --no-cache mesa-dri-vc4 mesa-dri-swrast mesa-gbm xf86-video-fbdev >/dev/null && bashio::log.green "... done" || +# bashio::log.red "... not successful. Are you on a rpi?" +#fi # Fix mate software center -if [ -f /usr/lib/dbus-1.0/dbus-daemon-launch-helper ]; then - echo "Allow software center" - chmod u+s /usr/lib/dbus-1.0/dbus-daemon-launch-helper - service dbus restart -fi +#if [ -f /usr/lib/dbus-1.0/dbus-daemon-launch-helper ]; then +# echo "Allow software center" +# chmod u+s /usr/lib/dbus-1.0/dbus-daemon-launch-helper +# service dbus restart +#fi # Install specific apps if bashio::config.has_value 'additional_apps'; then @@ -34,7 +24,11 @@ if bashio::config.has_value 'additional_apps'; then for APP in ${NEWAPPS//,/ }; do bashio::log.green "... $APP" # shellcheck disable=SC2015 - apk add --no-cache "$APP" >/dev/null || bashio::log.red "... not successful, please check package name" + if command -v "apk" &>/dev/null; then + apk add --no-cache "$APP" >/dev/null || bashio::log.red "... not successful, please check package name" + elif command -v "apt" &>/dev/null; then + apt-get install -yqq --no-install-recommends "$APP" >/dev/null || bashio::log.red "... not successful, please check package name" + fi done fi