SliTaz Repositories

     1.1 --- a/get-java6-jre/stuff/get-java6-jre	Sun Jan 06 14:02:36 2013 +0100
     1.2 +++ b/get-java6-jre/stuff/get-java6-jre	Fri Dec 25 21:45:26 2015 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -#!/bin/sh 
     1.5 +#!/bin/sh
     1.6  # Get and install the SUN Java Runtime Environnement
     1.7  #
     1.8  # (C) 2007-2012 SliTaz - GNU General Public License v3.
     1.9 @@ -10,22 +10,24 @@
    1.10  SHORT_DESC="SUN Java Runtime."
    1.11  DEPENDS="xorg-libXtst"
    1.12  TARBALL="jre.bin"
    1.13 -TEMP_DIR="/tmp/$PACKAGE.$$"
    1.14 +TEMP_DIR="$(mktemp -d)"
    1.15  ROOT="$1"
    1.16  
    1.17  URL="$(wget -O - ${WEB_SITE}en/download/manual_v6.jsp | \
    1.18         sed '/self-extracting/!d;s/.*href="\([^"]*\).*/\1/;q')"
    1.19  
    1.20  # Check if we are root starting anything
    1.21 -if test $(id -u) != 0 ; then
    1.22 +if [ $(id -u) -ne 0 ]; then
    1.23  	echo -e "\nYou must be root to run `basename $0`."
    1.24  	echo -e "Please type 'su' and root password to become super-user.\n"
    1.25 +	rm -rf "$TEMP_DIR"
    1.26  	exit 1
    1.27  fi
    1.28  
    1.29  # Avoid reinstall
    1.30  if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
    1.31  	echo -e "\n$PACKAGE package is already installed.\n"
    1.32 +	rm -rf "$TEMP_DIR"
    1.33  	exit 1
    1.34  fi
    1.35  
    1.36 @@ -33,14 +35,13 @@
    1.37  
    1.38  # Create TEMP_DIR
    1.39  CUR_DIR=$(pwd)
    1.40 -test -d $TEMP_DIR || mkdir $TEMP_DIR
    1.41  cd $TEMP_DIR
    1.42  
    1.43  # Download the file
    1.44  test -f $TARBALL || wget $URL -O $TARBALL
    1.45  if [ ! -f $TARBALL ]; then
    1.46  	cd $CUR_DIR
    1.47 -	rm -rf $TEMP_DIR
    1.48 +	rm -rf "$TEMP_DIR"
    1.49  	echo "Could not download $TARBALL. Exiting."
    1.50  	exit 1
    1.51  fi
    1.52 @@ -79,13 +80,11 @@
    1.53  
    1.54  post_install()
    1.55  {
    1.56 -	echo -n "Processing post install commands..."
    1.57  	[ -d /usr/lib/mozilla/plugins ] || mkdir -p /usr/lib/mozilla/plugins 
    1.58  	ln -s /usr/lib/java/jre\$VERSION/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins
    1.59  
    1.60  	cd /usr/bin
    1.61  	ln -s /usr/lib/java/jre\$VERSION/bin/java 
    1.62 -	status
    1.63  }
    1.64  
    1.65  post_remove()
    1.66 @@ -109,4 +108,4 @@
    1.67  
    1.68  # Clean
    1.69  cd $CUR_DIR
    1.70 -rm -rf $TEMP_DIR
    1.71 +rm -rf "$TEMP_DIR"