diff options
| author | Jonathan Bauer | 2014-01-16 16:45:59 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-16 16:45:59 +0100 |
| commit | 802fb95bcf9d399a40df4452672c5d9e3b862c96 (patch) | |
| tree | fe45b0cc61adc4b22a331b3a07c53d187f06ee8c | |
| parent | updated to the new year! (diff) | |
| parent | [mltk] added -h and --help - options (diff) | |
| download | tm-scripts-802fb95bcf9d399a40df4452672c5d9e3b862c96.tar.gz tm-scripts-802fb95bcf9d399a40df4452672c5d9e3b862c96.tar.xz tm-scripts-802fb95bcf9d399a40df4452672c5d9e3b862c96.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
| -rwxr-xr-x | mltk | 3 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.debian | 2 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.opensuse | 1 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.ubuntu | 1 |
4 files changed, 3 insertions, 4 deletions
@@ -183,6 +183,9 @@ read_params() { if [[ "$1" != -* ]]; then TARGET="$1" shift + elif [[ "$1" == "-h" || "$1" == "--help" ]]; then + print_usage + exit 1 elif [[ "$1" != "-n" ]]; then perror "A target is required. None given." fi diff --git a/remote/modules/xorg/xorg.conf.debian b/remote/modules/xorg/xorg.conf.debian index b1c26ae9..2cc9d6f1 100644 --- a/remote/modules/xorg/xorg.conf.debian +++ b/remote/modules/xorg/xorg.conf.debian @@ -1,5 +1,4 @@ REQUIRED_INSTALLED_PACKAGES=" - xprintidle " REQUIRED_CONTENT_PACKAGES=" xserver-xorg$UBUNTU_XORG_PKG_SUFFIX @@ -34,7 +33,6 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX - xprintidle " REQUIRED_DIRECTORIES+=" /usr/lib diff --git a/remote/modules/xorg/xorg.conf.opensuse b/remote/modules/xorg/xorg.conf.opensuse index ef353a4c..1e6f5ff1 100644 --- a/remote/modules/xorg/xorg.conf.opensuse +++ b/remote/modules/xorg/xorg.conf.opensuse @@ -37,7 +37,6 @@ REQUIRED_CONTENT_PACKAGES=" libpixman-1-0 xrandr vaapi-intel-driver - xprintidle " REQUIRED_LIBRARIES=" libI810XvMC diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu index e62a50f8..69c3e64c 100644 --- a/remote/modules/xorg/xorg.conf.ubuntu +++ b/remote/modules/xorg/xorg.conf.ubuntu @@ -33,7 +33,6 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX - xprintidle " REQUIRED_DIRECTORIES+=" /usr/lib |