# HG changeset patch # User Liu Peng # Date 1269017493 0 # Node ID f8082abc654d377ac678e1ea7675f7c544b0fb73 # Parent c64834e1639ad002e8aa41724162ecfc4c36bd5e Updated get-google-chrome: get script added -f / -r options diff -r c64834e1639a -r f8082abc654d get-google-chrome/receipt --- a/get-google-chrome/receipt Fri Mar 19 15:49:11 2010 +0000 +++ b/get-google-chrome/receipt Fri Mar 19 16:51:33 2010 +0000 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="get-google-chrome" -VERSION="1.01" +VERSION="1.02" CATEGORY="non-free" SHORT_DESC="Google Chrome is built with open source code from Chromium." MAINTAINER="rocky@slitaz.org" diff -r c64834e1639a -r f8082abc654d get-google-chrome/stuff/get-google-chrome --- a/get-google-chrome/stuff/get-google-chrome Fri Mar 19 15:49:11 2010 +0000 +++ b/get-google-chrome/stuff/get-google-chrome Fri Mar 19 16:51:33 2010 +0000 @@ -6,7 +6,17 @@ URL="http://dl.google.com/linux/direct/$DEBPKG" CUR_DIR=$(pwd) TEMP_DIR=/tmp/$PACKAGE-$$ -ROOT="$1" +ROOT= +FORCED= + +while getopts "hfr:" option; do + case $option in + h) echo -e "Usage: $(basename $0) [-f|-r path]\n -f: force install.\n -r path: root directory."; exit 1 ;; + f) FORCED="--forced" ;; + r) ROOT=$OPTARG ;; + \?) echo "Wrong argument, Exit ...."; exit 1 ;; + esac +done # Check if we are root if test $(id -u) != 0 ; then @@ -16,8 +26,8 @@ fi # Avoid reinstall -if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then - echo -e "\n$PACKAGE package is already installed.\n" +if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ] && [ -z $FORCED ]; then + echo -e "\n$PACKAGE package is already installed, add '-f' option to force install.\n" exit 1 fi @@ -145,7 +155,7 @@ rm -rf $PACKAGE-$VERSION # Install pseudo package -yes y | tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT +yes y | tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT $FORCED # Clean cd $CUR_DIR