tazpkg rev 307

Mouved file path to a config file (/etc/slitaz/tazpkg.conf)
author Christophe Lincoln <pankso@slitaz.org>
date Wed Jan 06 22:04:04 2010 +0100 (2010-01-06)
parents 8a8843396ec5
children fa97de9857e0
files Makefile tazpkg tazpkg.conf
line diff
     1.1 --- a/Makefile	Fri Dec 25 14:42:53 2009 +0100
     1.2 +++ b/Makefile	Wed Jan 06 22:04:04 2010 +0100
     1.3 @@ -3,6 +3,7 @@
     1.4  PREFIX?=/usr
     1.5  DOCDIR?=$(PREFIX)/share/doc
     1.6  LIBDIR?=$(PREFIX)/lib/slitaz
     1.7 +SYSCONFDIR?=/etc/slitaz
     1.8  
     1.9  all:
    1.10  	grep "^VERSION=[0-9]" tazpkg | sed 's/VERSION=//'
    1.11 @@ -15,6 +16,9 @@
    1.12  	@echo "Installing Tazpkgbox lib into $(LIBDIR)..."
    1.13  	install -g root -o root -m 0755 -d $(LIBDIR)
    1.14  	cp -a lib/tazpkgbox $(LIBDIR)
    1.15 +	@echo "Installing configuration files..."
    1.16 +	install -g root -o root -m 0755 -d $(SYSCONFDIR)
    1.17 +	install -g root -o root -m 0644 tazpkg.conf $(SYSCONFDIR)
    1.18  	@echo "Installing documentation files..."
    1.19  	install -g root -o root -m 0755 -d $(DOCDIR)/tazpkg
    1.20  	install -g root -o root -m 0644 doc/* $(DOCDIR)/tazpkg
     2.1 --- a/tazpkg	Fri Dec 25 14:42:53 2009 +0100
     2.2 +++ b/tazpkg	Wed Jan 06 22:04:04 2010 +0100
     2.3 @@ -7,38 +7,23 @@
     2.4  # use 'tazpkg usage' to get a list of commands with short descriptions. Tazpkg
     2.5  # also resolves dependencies and can upgrade packages from a mirror.
     2.6  #
     2.7 -# (C) 2007-2008 SliTaz - GNU General Public License v3.
     2.8 +# (C) 2007-2010 SliTaz - GNU General Public License v3.
     2.9  #
    2.10  # Authors : Christophe Lincoln <pankso@slitaz.org>
    2.11  #           Pascal Bellard <pascal.bellard@slitaz.org>
    2.12  #           Eric Joseph-Alexandre <erjo@slitaz.org>
    2.13  #           Paul Issott <paul@slitaz.org>
    2.14  #
    2.15 -VERSION=3.1
    2.16 +VERSION=3.2
    2.17  
    2.18  ####################
    2.19  # Script variables #
    2.20  ####################
    2.21  
    2.22 -# Packages categories.
    2.23 -CATEGORIES="
    2.24 -base-system
    2.25 -x-window
    2.26 -utilities
    2.27 -network
    2.28 -graphics
    2.29 -multimedia
    2.30 -office
    2.31 -development
    2.32 -system-tools
    2.33 -security
    2.34 -games
    2.35 -misc
    2.36 -meta
    2.37 -non-free"
    2.38 +. /etc/slitaz/tazpkg.conf
    2.39  
    2.40 -# Initialize some variables to use words
    2.41 -# rather than numbers for functions and actions.
    2.42 +# Initialize some variables to use words rather than numbers for functions
    2.43 +# and actions.
    2.44  COMMAND=$1
    2.45  if [ -f "$2" ]; then
    2.46  	# Set pkg basename for install, extract
    2.47 @@ -50,17 +35,13 @@
    2.48  PACKAGE_FILE=$2
    2.49  TARGET_DIR=$3
    2.50  TOP_DIR=`pwd`
    2.51 -TMP_DIR=/tmp/tazpkg-$$-$RANDOM
    2.52 +INSTALL_LIST=""
    2.53  
    2.54  # Path to tazpkg used dir and configuration files
    2.55 -LOCALSTATE=/var/lib/tazpkg
    2.56  INSTALLED=$LOCALSTATE/installed
    2.57 -CACHE_DIR=/var/cache/tazpkg
    2.58  MIRROR=$LOCALSTATE/mirror
    2.59  BLOCKED=$LOCALSTATE/blocked-packages.list
    2.60  DEFAULT_MIRROR="http://mirror.slitaz.org/packages/`cat /etc/slitaz-release`/"
    2.61 -INSTALL_LIST=""
    2.62 -LOG=/var/log/tazpkg.log
    2.63  
    2.64  # Messages language setting --> line 230.
    2.65  case $LANG in
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/tazpkg.conf	Wed Jan 06 22:04:04 2010 +0100
     3.3 @@ -0,0 +1,31 @@
     3.4 +# /etc/slitaz/tazpkg.conf: SliTaz package manager configuration file.
     3.5 +#
     3.6 +
     3.7 +# Path to all packages meta files (lists, receipt, desc).
     3.8 +LOCALSTATE="/var/lib/tazpkg"
     3.9 +
    3.10 +# Path to downloaded packages by get-intall command.
    3.11 +CACHE_DIR="/var/cache/tazpkg"
    3.12 +
    3.13 +# Path to Tazpkg log file.
    3.14 +LOG="/var/log/tazpkg.log"
    3.15 +
    3.16 +# Path to the temporary directory used to extract package.
    3.17 +TMP_DIR="/tmp/tazpkg-$$-$RANDOM"
    3.18 +
    3.19 +# Packages categories.
    3.20 +CATEGORIES="
    3.21 +base-system
    3.22 +x-window
    3.23 +utilities
    3.24 +network
    3.25 +graphics
    3.26 +multimedia
    3.27 +office
    3.28 +development
    3.29 +system-tools
    3.30 +security
    3.31 +games
    3.32 +misc
    3.33 +meta
    3.34 +non-free"