# HG changeset patch # User Pascal Bellard # Date 1226911802 0 # Node ID e01dd228942a6dfe7be95ec0a9031c730bd4e6e3 # Parent 71793d4be1502f96199ee8fa082680bec61fa255 get-*: add ROOT support diff -r 71793d4be150 -r e01dd228942a get-OpenOffice3/stuff/get-OpenOffice3 --- a/get-OpenOffice3/stuff/get-OpenOffice3 Sun Nov 16 17:23:17 2008 +0000 +++ b/get-OpenOffice3/stuff/get-OpenOffice3 Mon Nov 17 08:50:02 2008 +0000 @@ -8,6 +8,7 @@ PACKAGE="OpenOffice3" VERSION="3.0.0" URL="http://www.openoffice.org" +ROOT="$1" if [ "$LANG" = "fr_FR" ]; then TARBALL="OOo_${VERSION}_LinuxIntel_install_fr.tar.gz" @@ -49,7 +50,7 @@ check_if_installed() { # Avoid reinstall - if [ -d /var/lib/tazpkg/installed/$PACKAGE ];then + if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ];then return 0 else return 1 @@ -62,6 +63,7 @@ #check if package already installed if (check_if_installed $PACKAGE); then echo "$PACKAGE is already installed." + [ -n "$ROOT" ] && exit 0 echo -n "Would you like to remove and reinstall this package [y/n]? " read answer case "$answer" in @@ -153,7 +155,7 @@ tazpkg pack $PACKAGE-$VERSION # Install pseudo package -tazpkg install $PACKAGE-$VERSION.tazpkg +tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT # Clean rm -rf $TEMP_DIR diff -r 71793d4be150 -r e01dd228942a get-b43-firmware/stuff/get-b43-firmware --- a/get-b43-firmware/stuff/get-b43-firmware Sun Nov 16 17:23:17 2008 +0000 +++ b/get-b43-firmware/stuff/get-b43-firmware Mon Nov 17 08:50:02 2008 +0000 @@ -9,6 +9,7 @@ VERSION=4.80.53.0 TARBALL=$DIR-$VERSION.tar.bz2 WGET_URL="http://downloads.openwrt.org/sources/$TARBALL" +ROOT="$1" # Check if user is root to install. if test $(id -u) != 0 ; then @@ -18,7 +19,7 @@ fi # Avoid reinstall -if [ -d /var/lib/tazpkg/installed/b43-firmware ]; then +if [ -d $ROOT/var/lib/tazpkg/installed/b43-firmware ]; then echo -e "\nb43-firmware package is already installed.\n" exit 0 fi @@ -47,7 +48,7 @@ VERSION="$VERSION" CATEGORY="non-free" SHORT_DESC="Broadcom b43 firmware." -DEPENDS="b43-fwcutter" +DEPENDS="linux-wireless b43-fwcutter wireless_tools" WEB_SITE="http://downloads.openwrt.org/" EOT @@ -55,18 +56,20 @@ tazpkg pack b43-firmware-$VERSION # Install pseudo package -tazpkg install b43-firmware-$VERSION.tazpkg +tazpkg install b43-firmware-$VERSION.tazpkg --root=$ROOT # Clean cd /tmp rm -rf $TARBALL $DIR-$VERSION # Load b43 module -echo "Loading module: b43..." -modprobe b43 -sleep 1 +if [ -z "$ROOT" ]; then + echo "Loading module: b43..." + modprobe b43 + sleep 1 +fi # Configure /etc/network.conf and start connexion -sed -i s/'WIFI="no"'/'WIFI="yes"'/ /etc/network.conf -/etc/init.d/network.sh restart +sed -i s/'WIFI="no"'/'WIFI="yes"'/ $ROOT/etc/network.conf +[ -z "$ROOT" ] && /etc/init.d/network.sh restart diff -r 71793d4be150 -r e01dd228942a get-b43legacy-firmware/stuff/get-b43legacy-firmware --- a/get-b43legacy-firmware/stuff/get-b43legacy-firmware Sun Nov 16 17:23:17 2008 +0000 +++ b/get-b43legacy-firmware/stuff/get-b43legacy-firmware Mon Nov 17 08:50:02 2008 +0000 @@ -9,6 +9,7 @@ VERSION=3.130.20.0 TARBALL=$DIR-$VERSION.o WGET_URL="http://downloads.openwrt.org/sources/$TARBALL" +ROOT="$1" # Check if user is root to install. if test $(id -u) != 0 ; then @@ -18,7 +19,7 @@ fi # Avoid reinstall -if [ -d /var/lib/tazpkg/installed/b43legacy-firmware ]; then +if [ -d $ROOT/var/lib/tazpkg/installed/b43legacy-firmware ]; then echo -e "\nb43legacy-firmware package is already installed.\n" exit 0 fi @@ -47,7 +48,7 @@ VERSION="$VERSION" CATEGORY="non-free" SHORT_DESC="Broadcom b43legacy firmware." -DEPENDS="b43-fwcutter" +DEPENDS="linux-wireless b43-fwcutter wireless_tools" WEB_SITE="http://downloads.openwrt.org/" EOT @@ -55,18 +56,20 @@ tazpkg pack b43legacy-firmware-$VERSION # Install pseudo package -tazpkg install b43legacy-firmware-$VERSION.tazpkg +tazpkg install b43legacy-firmware-$VERSION.tazpkg --root=$ROOT # Clean cd /tmp rm -rf $TARBALL $DIR-$VERSION # Load b43legacy module -echo "Loading module: b43legacy..." -modprobe b43legacy -sleep 1 +if [ -z "$ROOT" ]; then + echo "Loading module: b43legacy..." + modprobe b43legacy + sleep 1 +fi # Configure /etc/network.conf and start connexion -sed -i s/'WIFI="no"'/'WIFI="yes"'/ /etc/network.conf -/etc/init.d/network.sh restart +sed -i s/'WIFI="no"'/'WIFI="yes"'/ $ROOT/etc/network.conf +[ -z "$ROOT" ] && /etc/init.d/network.sh restart diff -r 71793d4be150 -r e01dd228942a get-eclipse-pdt/stuff/get-eclipse-pdt --- a/get-eclipse-pdt/stuff/get-eclipse-pdt Sun Nov 16 17:23:17 2008 +0000 +++ b/get-eclipse-pdt/stuff/get-eclipse-pdt Mon Nov 17 08:50:02 2008 +0000 @@ -13,6 +13,7 @@ TEMP_DIR="/home/slitaz/build/$PACKAGE.$$" SOURCE_DIR="/home/slitaz/src" LOG="/tmp/$(basename $0 .sh).log" +ROOT="$1" # Status function with color (supported by Ash). status() @@ -41,7 +42,7 @@ check_if_installed() { # Avoid reinstall - if [ -d /var/lib/tazpkg/installed/$PACKAGE ];then + if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ];then return 1 else return 0 @@ -54,6 +55,7 @@ #check if package already installed if (check_if_installed $PACKAGE); then echo "$PACKAGE is already installed." + [ -n "$ROOT" ] && exit 0 echo -n "Would you like to remove and reinstall this package [y/n]? " read answer case "$answer" in @@ -129,7 +131,7 @@ tazpkg pack $PACKAGE-$VERSION # Install pseudo package -tazpkg install $PACKAGE-$VERSION.tazpkg +tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT # Clean rm -rf $TEMP_DIR diff -r 71793d4be150 -r e01dd228942a get-flash-plugin/stuff/get-flash-plugin --- a/get-flash-plugin/stuff/get-flash-plugin Sun Nov 16 17:23:17 2008 +0000 +++ b/get-flash-plugin/stuff/get-flash-plugin Mon Nov 17 08:50:02 2008 +0000 @@ -1,13 +1,16 @@ #!/bin/sh -e : ${DIALOG=tazdialog} +ROOT="$1" + if test $(id -u) != 0 ; then echo -e "\nYou must be root to run `basename $0`." echo -e "Please type 'su' and root password to become super-user.\n" exit 0 fi -if [ -d /var/lib/tazpkg/installed/flash-plugin ]; then +if [ -d $ROOT/var/lib/tazpkg/installed/flash-plugin ]; then + [ -n "$ROOT" ] && exit 1 tazpkg remove flash-plugin [ -d /var/lib/tazpkg/installed/flash-plugin ] && exit 1 fi @@ -18,6 +21,7 @@ VERSIONS=""; i=9; while true; do if wget -s ${URL}install_flash_player_${i}_linux.tar.gz 2> /dev/null; then VERSIONS="$VERSIONS $i" + [ -n "$ROOT" ] && break elif [ -n "$VERSIONS" ]; then break elif [ $i -gt 20 ]; then @@ -52,29 +56,39 @@ # Install files chmod 755 libflashplayer.so chown root.root libflashplayer.so -mv libflashplayer.so /usr/lib/firefox*/plugins +dir=flash-plugin-$VERSION/fs/usr/share/flash +mkdir -p $dir +mv libflashplayer.so $dir # Create pseudo package -while read file; do - dest=flash-plugin-$VERSION/fs$(dirname $file) - [ -d $dest ] || mkdir -p $dest - cp -a $file $dest -done < flash-plugin-$VERSION/receipt < skype-$VERSION/receipt < $PACKAGE-$VERSION/receipt <> $PKG-$VERSION/receipt # Pack tazpkg pack $PKG-$VERSION # Install pseudo package -tazpkg install $PKG-$VERSION.tazpkg +tazpkg install $PKG-$VERSION.tazpkg --root=$ROOT # Clean cd $TOP rm -rf $TMP # Check if we need wpa_supplicant -. /etc/network.conf +. $ROOT/etc/network.conf if [ $WIFI_KEY_TYPE = "wpa" ] || [ $WIFI_KEY_TYPE = "WPA" ]; then - if [ ! -d /var/lib/tazpkg/installed/wpa_supplicant ]; then - tazpkg get-install wpa_supplicant + if [ ! -d $ROOT/var/lib/tazpkg/installed/wpa_supplicant ]; then + tazpkg get-install wpa_supplicant --root=$ROOT fi fi # Load module -echo "Loading module: $MODULE..." -modprobe $MODULE -sleep 1 +if [ -z "$ROOT" ]; then + echo "Loading module: $MODULE..." + modprobe $MODULE + sleep 1 +fi # Configure /etc/network.conf and start connexion -sed -i s/'WIFI="no"'/'WIFI="yes"'/ /etc/network.conf -/etc/init.d/network.sh restart +sed -i s/'WIFI="no"'/'WIFI="yes"'/ $ROOT/etc/network.conf +[ -z "$ROOT" ] && /etc/init.d/network.sh restart