slitaz-base-files rev 150

merge
author Christian Mesh <meshca@clarkson.edu>
date Fri May 11 09:17:05 2012 -0500 (2012-05-11)
parents 628884aa895d 8ca19a8867e6
children f22c79a37a74
files
line diff
     1.1 --- a/Makefile	Fri May 11 09:16:31 2012 -0500
     1.2 +++ b/Makefile	Fri May 11 09:17:05 2012 -0500
     1.3 @@ -42,6 +42,12 @@
     1.4  	install -m 0755 -d $(DESTDIR)/usr/share/doc/slitaz
     1.5  	install -m 0644 doc/httphelper.txt $(DESTDIR)/usr/share/doc/slitaz
     1.6  
     1.7 +install-slitaz:
     1.8 +	install -m 0755 -d $(DESTDIR)/usr/bin
     1.9 +	install -m 0755 -d $(DESTDIR)/etc/slitaz
    1.10 +	install -m 0744 rootfs/usr/bin/slitaz $(DESTDIR)/usr/bin
    1.11 +	install -m 0644 rootfs/etc/slitaz/slitaz.conf $(DESTDIR)/etc/slitaz
    1.12 +
    1.13  install-msg: msgfmt
    1.14  	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale
    1.15  	cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale
     2.1 --- a/rootfs/etc/slitaz/slitaz.conf	Fri May 11 09:16:31 2012 -0500
     2.2 +++ b/rootfs/etc/slitaz/slitaz.conf	Fri May 11 09:17:05 2012 -0500
     2.3 @@ -3,8 +3,9 @@
     2.4  
     2.5  # Slitaz release.
     2.6  SLITAZ_RELEASE="$(cat /etc/slitaz-release)"
     2.7 -# OLD compatibility --> remove when other tools use SLITAZ_RELEASE
     2.8 -SLITAZ_VERSION="$SLITAZ_RELEASE"
     2.9 +
    2.10 +# Slitaz architecture.
    2.11 +SLITAZ_ARCH="i486"
    2.12  
    2.13  # Slitaz directory.
    2.14  SLITAZ_HOME="/home/slitaz"
    2.15 @@ -30,13 +31,10 @@
    2.16  
    2.17  # Online and local packages repository.
    2.18  ONLINE_PKGS="$MIRROR_URL/packages/$SLITAZ_RELEASE/"
    2.19 -LOCAL_PKGS="$SLITAZ_HOME/packages/$SLITAZ_RELEASE/"
    2.20 +LOCAL_PKGS="$SLITAZ_HOME/$SLITAZ_RELEASE/packages/"
    2.21  
    2.22 -# Path to Tazpkg data.
    2.23 -LOCALSTATE="/var/lib/tazpkg"
    2.24 -
    2.25 -# Path to installed packages data.
    2.26 -INSTALLED="$LOCALSTATE/installed"
    2.27 +# Path to Tazpkg data base.
    2.28 +PKGS_DB="/var/lib/tazpkg"
    2.29  
    2.30  # Packages categories.
    2.31  PKGS_CATEGORIES="
    2.32 @@ -55,5 +53,12 @@
    2.33  meta
    2.34  non-free"
    2.35  
    2.36 -# OLD compatibility --> Can be removed when tazpkg.conf have CACHE_DIR
    2.37 +#
    2.38 +# OLD variables for compatibility purpose.
    2.39 +#
    2.40 +
    2.41 +SLITAZ_VERSION="$SLITAZ_RELEASE"
    2.42  CACHE_DIR="/var/cache/tazpkg"
    2.43 +LOCALSTATE="$PKGS_DB"
    2.44 +INSTALLED="$PKGS_DB/installed"
    2.45 +
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/rootfs/usr/bin/slitaz	Fri May 11 09:17:05 2012 -0500
     3.3 @@ -0,0 +1,35 @@
     3.4 +#!/bin/sh
     3.5 +#
     3.6 +# SliTaz - Configs, release info, default paths, arch, kernel version, ...
     3.7 +#
     3.8 +. /lib/libtaz.sh
     3.9 +. /etc/slitaz/slitaz.conf
    3.10 +
    3.11 +# /etc/slitaz/slitaz.conf
    3.12 +: ${SLITAZ_ARCH=i486}
    3.13 +: ${PKGS_DB=/var/lib/tazpkg}
    3.14 +
    3.15 +case "$1" in
    3.16 +	""|--output=*)
    3.17 +		echo ""
    3.18 +		boldify "SliTaz GNU/Linux"
    3.19 +		separator
    3.20 +		cat << EOT
    3.21 +Release      : $SLITAZ_RELEASE
    3.22 +Architecture : $SLITAZ_ARCH
    3.23 +Kernel       : $(uname -r)
    3.24 +Boot options : $(cat /proc/cmdline)
    3.25 +Home path    : $SLITAZ_HOME
    3.26 +Configs      : $SLITAZ_CONFIGS
    3.27 +Log files    : $SLITAZ_LOGS
    3.28 +Packages DB  : $PKGS_DB
    3.29 +Installed    : $(ls $PKGS_DB/installed | wc -l) packages
    3.30 +Mirror       : $(cat $PKGS_DB/mirror)
    3.31 +EOT
    3.32 +		separator
    3.33 +		echo -e "Config file: /etc/slitaz/slitaz.conf\n" ;;
    3.34 +	*)
    3.35 +		echo "Usage: $(basename $0)" ;;
    3.36 +esac
    3.37 +
    3.38 +exit 0