# HG changeset patch
# User Christian Mesh <meshca@clarkson.edu>
# Date 1336745825 18000
# Node ID 40fba570d91f3ea270c9742b3c15fec47ad6ef97
# Parent  628884aa895d5db5343b02b23dc14a8957502c4e# Parent  8ca19a8867e6d26a38680055e57a4a2b12819613
merge

diff -r 628884aa895d -r 40fba570d91f Makefile
--- a/Makefile	Fri May 11 09:16:31 2012 -0500
+++ b/Makefile	Fri May 11 09:17:05 2012 -0500
@@ -42,6 +42,12 @@
 	install -m 0755 -d $(DESTDIR)/usr/share/doc/slitaz
 	install -m 0644 doc/httphelper.txt $(DESTDIR)/usr/share/doc/slitaz
 
+install-slitaz:
+	install -m 0755 -d $(DESTDIR)/usr/bin
+	install -m 0755 -d $(DESTDIR)/etc/slitaz
+	install -m 0744 rootfs/usr/bin/slitaz $(DESTDIR)/usr/bin
+	install -m 0644 rootfs/etc/slitaz/slitaz.conf $(DESTDIR)/etc/slitaz
+
 install-msg: msgfmt
 	install -m 0755 -d $(DESTDIR)$(PREFIX)/share/locale
 	cp -a po/mo/* $(DESTDIR)$(PREFIX)/share/locale
diff -r 628884aa895d -r 40fba570d91f rootfs/etc/slitaz/slitaz.conf
--- a/rootfs/etc/slitaz/slitaz.conf	Fri May 11 09:16:31 2012 -0500
+++ b/rootfs/etc/slitaz/slitaz.conf	Fri May 11 09:17:05 2012 -0500
@@ -3,8 +3,9 @@
 
 # Slitaz release.
 SLITAZ_RELEASE="$(cat /etc/slitaz-release)"
-# OLD compatibility --> remove when other tools use SLITAZ_RELEASE
-SLITAZ_VERSION="$SLITAZ_RELEASE"
+
+# Slitaz architecture.
+SLITAZ_ARCH="i486"
 
 # Slitaz directory.
 SLITAZ_HOME="/home/slitaz"
@@ -30,13 +31,10 @@
 
 # Online and local packages repository.
 ONLINE_PKGS="$MIRROR_URL/packages/$SLITAZ_RELEASE/"
-LOCAL_PKGS="$SLITAZ_HOME/packages/$SLITAZ_RELEASE/"
+LOCAL_PKGS="$SLITAZ_HOME/$SLITAZ_RELEASE/packages/"
 
-# Path to Tazpkg data.
-LOCALSTATE="/var/lib/tazpkg"
-
-# Path to installed packages data.
-INSTALLED="$LOCALSTATE/installed"
+# Path to Tazpkg data base.
+PKGS_DB="/var/lib/tazpkg"
 
 # Packages categories.
 PKGS_CATEGORIES="
@@ -55,5 +53,12 @@
 meta
 non-free"
 
-# OLD compatibility --> Can be removed when tazpkg.conf have CACHE_DIR
+#
+# OLD variables for compatibility purpose.
+#
+
+SLITAZ_VERSION="$SLITAZ_RELEASE"
 CACHE_DIR="/var/cache/tazpkg"
+LOCALSTATE="$PKGS_DB"
+INSTALLED="$PKGS_DB/installed"
+
diff -r 628884aa895d -r 40fba570d91f rootfs/usr/bin/slitaz
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rootfs/usr/bin/slitaz	Fri May 11 09:17:05 2012 -0500
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# SliTaz - Configs, release info, default paths, arch, kernel version, ...
+#
+. /lib/libtaz.sh
+. /etc/slitaz/slitaz.conf
+
+# /etc/slitaz/slitaz.conf
+: ${SLITAZ_ARCH=i486}
+: ${PKGS_DB=/var/lib/tazpkg}
+
+case "$1" in
+	""|--output=*)
+		echo ""
+		boldify "SliTaz GNU/Linux"
+		separator
+		cat << EOT
+Release      : $SLITAZ_RELEASE
+Architecture : $SLITAZ_ARCH
+Kernel       : $(uname -r)
+Boot options : $(cat /proc/cmdline)
+Home path    : $SLITAZ_HOME
+Configs      : $SLITAZ_CONFIGS
+Log files    : $SLITAZ_LOGS
+Packages DB  : $PKGS_DB
+Installed    : $(ls $PKGS_DB/installed | wc -l) packages
+Mirror       : $(cat $PKGS_DB/mirror)
+EOT
+		separator
+		echo -e "Config file: /etc/slitaz/slitaz.conf\n" ;;
+	*)
+		echo "Usage: $(basename $0)" ;;
+esac
+
+exit 0