From e6d7e8e6936e70e1d6a7d1f5df5171280befbfd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 15 Jan 2014 20:07:03 +0100 Subject: Update remaining metapackages on Debian and Ubuntu to conform the current automated scripts on build-farm --- .../scripts/casper-bottom/15autologin-trinity | 41 ++++++++++++++++++++++ .../scripts/casper-bottom/25adduser-trinity | 33 +++++++++++++++++ .../metapackages/casper-trinity/debian/rules | 16 +++++++++ .../scripts/casper-bottom/15autologin-trinity | 41 ---------------------- .../scripts/casper-bottom/25adduser-trinity | 33 ----------------- 5 files changed, 90 insertions(+), 74 deletions(-) create mode 100755 ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity create mode 100755 ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity delete mode 100755 ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity delete mode 100755 ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity (limited to 'ubuntu/precise/metapackages/casper-trinity') diff --git a/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity new file mode 100755 index 000000000..a018471b7 --- /dev/null +++ b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity @@ -0,0 +1,41 @@ +#!/bin/sh + +PREREQ="" +DESCRIPTION="Setting up automatic login (Trinity)..." + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +. /scripts/casper-functions + +log_begin_msg "$DESCRIPTION" + +if [ -f /root/etc/trinity/kdm/kdmrc ]; then + # Configure KDM-Trinity autologin + sed -i -r \ + -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ + -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ + -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ + /root/etc/trinity/kdm/kdmrc +fi + +if [ -f /root/etc/trinity/tdm/tdmrc ]; then + # Configure TDM-Trinity autologin + sed -i -r \ + -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ + -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ + -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ + /root/etc/trinity/tdm/tdmrc +fi + +log_end_msg diff --git a/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity new file mode 100755 index 000000000..bd764edcc --- /dev/null +++ b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity @@ -0,0 +1,33 @@ +#!/bin/sh + +PREREQ="" +DESCRIPTION="Adding live session user (Trinity)..." + +prereqs() +{ + echo "$PREREQ" +} + +case $1 in +# get pre-requisites +prereqs) + prereqs + exit 0 + ;; +esac + +. /scripts/casper-functions + +log_begin_msg "$DESCRIPTION" + +#Trinity +if [ -d "/root/etc/trinity" ]; then + if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then + sed -i 's/\(OnlyShowIn=.*\)/\1KDE;TDE;/' "/root/usr/share/applications/ubiquity-gtkui.desktop" + fi + if [ -f "/root/home/$USERNAME/Desktop/ubiquity-gtkui.desktop" ]; then + sed -i 's/\(OnlyShowIn=.*\)/\1KDE;TDE;/' "/root/home/$USERNAME/Desktop/ubiquity-gtkui.desktop" + fi +fi + +log_end_msg diff --git a/ubuntu/precise/metapackages/casper-trinity/debian/rules b/ubuntu/precise/metapackages/casper-trinity/debian/rules index 9ded53d05..e6b6748ab 100755 --- a/ubuntu/precise/metapackages/casper-trinity/debian/rules +++ b/ubuntu/precise/metapackages/casper-trinity/debian/rules @@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) + +build: debian/stamp-distrospecific + +debian/stamp-distrospecific: + dh_testdir + [ -e debian/stamp-distrospecific ] || \ + ls -a1 debian/distrospecific | grep -v "^\.*$$" | \ + tee debian/stamp-distrospecific | \ + tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..) + +clean:: + dh_testdir + [ ! -e debian/stamp-distrospecific ] || \ + cat debian/stamp-distrospecific | \ + tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific + rm -f debian/stamp-distrospecific diff --git a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity deleted file mode 100755 index a018471b7..000000000 --- a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -PREREQ="" -DESCRIPTION="Setting up automatic login (Trinity)..." - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -. /scripts/casper-functions - -log_begin_msg "$DESCRIPTION" - -if [ -f /root/etc/trinity/kdm/kdmrc ]; then - # Configure KDM-Trinity autologin - sed -i -r \ - -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ - -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ - -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ - /root/etc/trinity/kdm/kdmrc -fi - -if [ -f /root/etc/trinity/tdm/tdmrc ]; then - # Configure TDM-Trinity autologin - sed -i -r \ - -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \ - -e "s/^#?AutoLoginUser=.*\$/AutoLoginUser=$USERNAME/" \ - -e "s/^#?AutoLoginAgain=.*\$/AutoLoginAgain=true/" \ - /root/etc/trinity/tdm/tdmrc -fi - -log_end_msg diff --git a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity deleted file mode 100755 index bd764edcc..000000000 --- a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -PREREQ="" -DESCRIPTION="Adding live session user (Trinity)..." - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -. /scripts/casper-functions - -log_begin_msg "$DESCRIPTION" - -#Trinity -if [ -d "/root/etc/trinity" ]; then - if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then - sed -i 's/\(OnlyShowIn=.*\)/\1KDE;TDE;/' "/root/usr/share/applications/ubiquity-gtkui.desktop" - fi - if [ -f "/root/home/$USERNAME/Desktop/ubiquity-gtkui.desktop" ]; then - sed -i 's/\(OnlyShowIn=.*\)/\1KDE;TDE;/' "/root/home/$USERNAME/Desktop/ubiquity-gtkui.desktop" - fi -fi - -log_end_msg -- cgit v1.2.1