X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from mail-qc0-f172.google.com (mail-qc0-f172.google.com [209.85.216.172]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 56109DC007C for ; Fri, 21 Nov 2014 18:05:50 +0000 (UTC) Received: by mail-qc0-f172.google.com with SMTP id m20so4124769qcx.17 for ; Fri, 21 Nov 2014 10:05:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=OG6nqbowxIyh6JuzUCcBciembn2EY/oU0zPS+b6jWms=; b=bqcCpuvaq7LSvoh0qejLyQGNoNBAyYWvmfoBpxJX+EFFENeDebAfReA8Og1e/3nQxB uYAqBS+SIfAD7ZizErkaoMUPYHxn/qj46tSDeUaVhRF7tenY9n1HKHchBxschnqpM7ML Em6lddPkFyYV/hUG89P36THbXa249MvpIPrnU2caOWgE88KDmCG7JK14jw71GymflWmb 5ctK2xPfBiF9c0OJVLd5BZ9HQbCpU+TkFu1L41+3vwFW+za9f2Evo8/4j1aEf8Z5aVPT M6nWiyIFoUfHNfwSqiJ0ytZkovPeNsQsIK2or4hcqq72nk2VewaEGQGzMeAGJ5ebEmtq QAOg== X-Received: by 10.224.131.135 with SMTP id x7mr8411425qas.38.1416593149850; Fri, 21 Nov 2014 10:05:49 -0800 (PST) Received: from labgit.bethel.jw.org ([186.233.140.3]) by mx.google.com with ESMTPSA id u2sm5262967qae.15.2014.11.21.10.05.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 21 Nov 2014 10:05:49 -0800 (PST) From: Alan Lacerda X-Google-Original-From: Alan Lacerda To: alpine-devel@lists.alpinelinux.org Cc: Alan Lacerda Subject: [alpine-devel] [PATCH] alpine-conf: merged setup-xfce|gparted-desktop into setup-desktop Date: Fri, 21 Nov 2014 18:05:40 +0000 Message-Id: <1416593140-30345-1-git-send-email-alacerda@alpinelinux.org> X-Mailer: git-send-email 2.1.3 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- Makefile | 1 + setup-desktop.in | 105 +++++++++++++++++++++++++++++++++++++++++++++++ setup-gparted-desktop.in | 42 ------------------- setup-xfce-desktop | 6 --- 4 files changed, 106 insertions(+), 48 deletions(-) create mode 100644 setup-desktop.in delete mode 100644 setup-gparted-desktop.in delete mode 100644 setup-xfce-desktop diff --git a/Makefile b/Makefile index 620d8ec..fa5c175 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ SBIN_FILES := lbu\ setup-apkcache\ setup-apkrepos\ setup-bootable\ + setup-desktop\ setup-disk\ setup-dns\ setup-gparted-desktop\ diff --git a/setup-desktop.in b/setup-desktop.in new file mode 100644 index 0000000..5355ee4 --- /dev/null +++ b/setup-desktop.in @@ -0,0 +1,105 @@ +#!/bin/sh +# +# setup-desktop - utility to configure a desktop environment +# Copyright (c) 2014 A L - Alpine Linux +# May be distributed under GPL2 +# + +apk update -q + +drivers=$(apk search -q 'xf86-video-*' | grep -v -- '-doc$') + +common_pkgs="gst-plugins-good1 gst-plugins-bad1 \ + gst-plugins-ugly1 gst-libav1 \ + gst-plugins-good1 gst-plugins-bad1 \ + gst-plugins-ugly1 gst-ffmpeg0.10 \ + claws-mail claws-mail-plugins-pgp \ + claws-mail-plugins-smime \ + claws-mail-plugins-address-keeper \ + claws-mail-plugins-pdf-viewer \ + firefox icedtea-web pidgin \ + faenza-icon-theme-pidgin pidgin-lang \ + pidgin-otr galculator \ + evince audacious sudo xinit setxkbmap \ + xrandr abiword gnumeric lxdm ttf-freefont" + +xfce_pkgs="mousepad ristretto xfce4" + +gparted_pkgs="gparted st openbox" + +# Our default choice goes to... +environment="xfce" + +setup_xfce () { + setup-xorg-base $drivers + apk add $common_pkgs $xfce_pkgs + rc-update add lxdm +} + +setup_gparted () { + setup-xorg-base $gparted_pkgs + +# create openbox menu +mkdir -p ~/.config/openbox +cat >~/.config/openbox/menu.xml< + + + + +EOF + +# create xinitrc +cat >~/.xinitrc < [environment]" + echo "" + echo "option:" + echo -e " --environment|-e \t Define the environment to install" + echo -e " --help|-h \t\t Show this help message" + echo "" + echo "envitonment:" + echo -e " xfce \t XFCE4 Desktop Environment" + echo -e " gparted \t Basic Gparted Desktop Environment" + exit 1 +} + +case x"$1" in + x) setup_$environment + x-e|x--environment) environment="$2" ;; + *) usage ;; +esac + +if [ "$environment" == "gparted" ] || [ "$environment" == "xfce" ]; then + setup_$environment +else + usage +fi diff --git a/setup-gparted-desktop.in b/setup-gparted-desktop.in deleted file mode 100644 index 37cefe6..0000000 --- a/setup-gparted-desktop.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -setup-xorg-base gparted xinit st openbox ttf-freefont $@ - -# create openbox menu -mkdir -p ~/.config/openbox -cat >~/.config/openbox/menu.xml< - - - - -EOF - -# create xinitrc -cat >~/.xinitrc <