diff --git a/Jenkinsfile b/Jenkinsfile index 770661a..abdf19b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -673,7 +673,7 @@ pipeline { -e DO_REGION="ams3" \ -e DO_BUCKET="lsio-ci" \ -t ghcr.io/linuxserver/ci:latest \ - python /ci/ci.py''' + python3 test_build.py''' } } } diff --git a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run index 1a2f4d6..5ee862b 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run +++ b/root/etc/s6-overlay/s6-rc.d/init-rdesktop/run @@ -1,23 +1,25 @@ #!/usr/bin/with-contenv bash if [ ! -e /lock.file ]; then - # give abc a sudo shell - chsh abc -s /bin/bash - sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \ - -i /etc/sudoers - sed -e 's/^wheel:\(.*\)/wheel:\1,abc/g' -i /etc/group + # give abc a sudo shell + chsh abc -s /bin/bash + sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \ + -i /etc/sudoers + sed -e 's/^wheel:\(.*\)/wheel:\1,abc/g' -i /etc/group fi # create lock file after first run touch /lock.file # default file copies first run -[[ ! -d /config/.config ]] && \ - mkdir -p /config/.config && \ - cp /defaults/bashrc /config/.bashrc && \ - cp /defaults/startwm.sh /config/startwm.sh +if [ ! -d /config/.config ]; then + mkdir -p /config/.config + cp /defaults/bashrc /config/.bashrc + cp /defaults/startwm.sh /config/startwm.sh +fi # permissions PERM=$(stat -c '%U' /config/.config) -[[ "${PERM}" != "abc" ]] && \ - chown -R abc:abc /config +if [ "${PERM}" != "abc" ]; then + chown -R abc:abc /config +fi