SliTaz Repositories

     1.1 --- a/get-java6-jdk/stuff/get-java6-jdk	Sun Feb 28 19:46:30 2010 +0000
     1.2 +++ b/get-java6-jdk/stuff/get-java6-jdk	Sat Mar 07 16:37:51 2020 +0100
     1.3 @@ -9,39 +9,41 @@
     1.4  VERSION="1.6.0_13"
     1.5  URL="http://raphaello.univ-fcomte.fr/ftp/java/Jdk"
     1.6  TARBALL="jdk-6u13-linux-i586.bin"
     1.7 -TEMP_DIR="/tmp/$PACKAGE.$$"
     1.8 +TEMP_DIR="$(mktemp -d)"
     1.9  ROOT="$1"
    1.10  
    1.11  # Check if we are root starting anything
    1.12 -if test $(id -u) != 0 ; then
    1.13 -	echo -e "\nYou must be root to run `basename $0`."
    1.14 +if [ $(id -u) -ne 0 ]; then
    1.15 +	echo -e "\nYou must be root to run $(basename $0)."
    1.16  	echo -e "Please type 'su' and root password to become super-user.\n"
    1.17 +	rm -rf "$TEMP_DIR"
    1.18  	exit 1
    1.19  fi
    1.20  
    1.21  # Avoid reinstall
    1.22  if [ -d $ROOT/var/lib/tazpkg/installed/$PACKAGE ]; then
    1.23  	echo -e "\n$PACKAGE package is already installed.\n"
    1.24 +	rm -rf "$TEMP_DIR"
    1.25  	exit 1
    1.26  fi
    1.27  
    1.28  # Check if java6-jre is installed 
    1.29  if [ -d $ROOT/var/lib/tazpkg/installed/java6-jre ]; then
    1.30  	echo -e "\njava6-jre must be uninstalled before install java6-jdk.\n"
    1.31 +	rm -rf "$TEMP_DIR"
    1.32  	exit 2
    1.33  fi
    1.34  
    1.35  
    1.36  # Create TEMP_DIR
    1.37  CUR_DIR=$(pwd)
    1.38 -test -d $TEMP_DIR || mkdir $TEMP_DIR
    1.39  cd $TEMP_DIR
    1.40  
    1.41  # Download the file
    1.42  test -f $TARBALL || wget $URL/$TARBALL
    1.43  if [ ! -f $TARBALL ]; then
    1.44  	cd $CUR_DIR
    1.45 -	rm -rf $TMP_DIR
    1.46 +	rm -rf "$TMP_DIR"
    1.47  	echo "Could not download $TARBALL. Exiting."
    1.48  	exit 1
    1.49  fi
    1.50 @@ -79,7 +81,6 @@
    1.51  
    1.52  post_install()
    1.53  {
    1.54 -	echo -n "Processing post install commands..."
    1.55  	cd /usr/lib/firefox*/plugins
    1.56  	ln -s /usr/lib/java/jdk\$VERSION/jre/plugin/i386/ns7/libjavaplugin_oji.so
    1.57  
    1.58 @@ -89,7 +90,6 @@
    1.59  	ln -s /usr/lib/java/jdk\$VERSION/bin/javac
    1.60  	ln -s /usr/lib/java/jdk\$VERSION/bin/javadoc
    1.61  	ln -s /usr/lib/java/jdk\$VERSION/bin/javap
    1.62 -	status
    1.63  }
    1.64  
    1.65  post_remove()
    1.66 @@ -110,10 +110,4 @@
    1.67  
    1.68  # Clean
    1.69  cd $CUR_DIR
    1.70 -rm -rf $TEMP_DIR
    1.71 -
    1.72 -
    1.73 -
    1.74 -
    1.75 -
    1.76 -
    1.77 +rm -rf "$TEMP_DIR"