# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1554478483 -3600
# Node ID d7b0fb9b6487324f45f00a1cef6db998d998235f
# Parent  a5dec5e185695ee3231501ae9305f5f4d305dae6
updated command procedure get-google-earth

diff -r a5dec5e18569 -r d7b0fb9b6487 get-google-earth/receipt
--- a/get-google-earth/receipt	Wed Apr 03 18:28:33 2019 +0200
+++ b/get-google-earth/receipt	Fri Apr 05 16:34:43 2019 +0100
@@ -1,15 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="get-google-earth"
-VERSION="1.00"
+VERSION="1.01"
 CATEGORY="non-free"
+TAGS="map visualization"
 SHORT_DESC="Get Google Earth."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
-WEB_SITE="http://earth.google.com/"
-TAGS="map visualization"
+WEB_SITE="https://google.com/earth/"
 
-DEPENDS="bzip2 xorg-base-fonts"
+DEPENDS=""
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
@@ -17,4 +17,3 @@
 	mkdir -p $fs/usr/bin
 	cp stuff/get-google-earth $fs/usr/bin
 }
-
diff -r a5dec5e18569 -r d7b0fb9b6487 get-google-earth/stuff/get-google-earth
--- a/get-google-earth/stuff/get-google-earth	Wed Apr 03 18:28:33 2019 +0200
+++ b/get-google-earth/stuff/get-google-earth	Fri Apr 05 16:34:43 2019 +0100
@@ -1,80 +1,194 @@
-#!/bin/sh -e
+#!/bin/sh
+#
+# get-google-earth - create and install SliTaz package google-earth
+#
+# (C) 2019 SliTaz - GNU General Public License v3.
+# Author : unknown
+# modified by HGT on 2019-04-05
+#
 
-DEPENDS="mesa"
-ROOT="$1"
-PACKAGE="google-earth"
+#	=== Initialisations ===
 
-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
+PKGS_DB="/var/lib/tazpkg"	# packages database directory
+PACKAGE="google-earth"		# package to create and install
+WEB_SITE="https://google.com/earth/"
+CATEGORY="non-free"
+DEPENDS="libglu-mesa"
+
+# Declare functions check_root, status, ...
+. /lib/libtaz.sh
+# and make commandline options (if any) available as variables
+
+is_installed()
+{
+	 if [ -d $ROOT$PKGS_DB/installed/$PACKAGE ]
+	  then	#package is deemed to be installed
+	 	return 0
+	  else
+	 	return 1
+	 fi
+}
+
+
+# Show commandline options, if requested by --help
+if [ "$help" == "yes" ]
+	then
+	echo "Commandline options:
+  $0
+	--version=<version>
+	--root=<path-to-root>
+	--install=yes|no
+	--keep=no|yes
+	--tmpdir=<directory-to-build-package>"
+	exit
 fi
 
-if [ -d $ROOT/var/lib/tazpkg/installed/google-earth ]; then
-  [ -n "$ROOT" ] && exit 1
-  tazpkg remove google-earth
-  [ -d /var/lib/tazpkg/installed/google-earth ] && exit 1
+# Check for system administrator privileges
+check_root
+
+title "Package $PACKAGE will be build as SliTaz package and installed"
+
+# Fetch latest version, unless version is set by option --version
+[ -z "$version" ] && version="latest"
+
+# Install SliTaz package, unless inhibited by option --install=no
+[ -z "$install" ] && install="yes"
+
+# Delete SliTaz package file $PACKAGE-$VERSION.tazpkg after installation,
+# unless option --keep=yes is given
+[ -z "$keep" ] && keep="no"
+
+# Directory for temporary files
+[ -z "$tempdir" ] && TMP_DIR="/tmp/get-$PACKAGE"
+
+# Logging file (unused by now)
+LOG=$TMP_DIR/get-$PACKAGE.log
+
+cat <<EOT
+Options in use:
+  root           : $root/
+  version        : $version
+  install package: $install
+  keep tazpkg    : $keep
+  build directory: $TMP_DIR
+
+EOT
+
+separator; newline
+
+#	=== Remove package, if installed ===
+if [ is_installed ]
+	then
+		action "Removing installed version..."
+		tazpkg remove $PACKAGE --root="$root/"
+		[ ! is_installed ] &&
+		die "Can't remove installed version. Exiting."
 fi
 
-TMP_DIR=/tmp/get-google-earth-$$-$RANDOM
-CUR_DIR=$(pwd)
-mkdir -p $TMP_DIR && cd $TMP_DIR
+#	=== Fetch archive file, if not existing ===
 
-# Download tarball
-wget http://dl.google.com/earth/client/current/GoogleEarthLinux.bin
-if [ ! -f GoogleEarthLinux.bin ]; then
-	cd $CUR_DIR
-	rm -rf $TMP_DIR
-	echo "Could not download GoogleEarthLinux.bin. Exiting."
-	exit 1
+if [ "$version" == "latest" ]
+	then
+	  FILE="google-earth-stable_current_i386.deb"
+	  WGET_URL="https://dl.google.com/dl/earth/client/current/$FILE"
+	else
+		# only available version is 7.3.0.3832-r0
+	  FILE="google-earth-pro-stable_${version}_i386.deb"
+	  V1=${version%%.*}
+	  V3=${version%.*}
+	  WGET_URL="https://dl.google.com/dl/earth/client/GE$V1/release_${V3//./_}/$FILE"
 fi
 
-chmod +x GoogleEarthLinux.bin
-sed -i 's/bzip2 -d/bunzip2/g' GoogleEarthLinux.bin
+CUR_DIR=$(pwd)
+mkdir -p $TMP_DIR
+cd $TMP_DIR
+if [ -f $FILE ]
+	then
+		echo "Using existing archive file $FILE"
+	else
+		action "Fetching the archive"
+		newline
+		wget	--no-check-certificate $WGET_URL
+		if [ ! -f $FILE ]
+		  then
+			cd $CUR_DIR
+			rm -rf $TMP_DIR
+			echo "Could not transfer $FILE from $URL. Exiting."
+			exit 1
+		fi
+fi
 
-VERSION=$(head GoogleEarthLinux.bin | grep ^label | sed 's/.*Linux \(.*\)"/\1/')
+#	=== Extract files from archive ===
+action "Extracting the archive"
 
-# Add depends
-for i in $DEPENDS; do
-	yes y | tazpkg get-install $i
-done
+mkdir $PACKAGE
+# Extract metadata
+dpkg-deb -e $FILE $PACKAGE/meta
+# Extract files
+dpkg-deb -x $FILE $PACKAGE/fs
+status
 
-# Extract
-./GoogleEarthLinux.bin
+# Remove archive file
+rm -f $FILE
 
-# extracted pkg can be removed: Save RAM
-rm -rf GoogleEarthLinux.bin
+#	=== Create SliTaz package ===
 
-# Create pseudo package
-while read file; do
-	dest=google-earth-$VERSION/fs$(dirname $file)
-	[ -d $dest ] || mkdir -p $dest
-	cp -a $file $dest
-done <<EOT
-$(ls /*bin/googleearth /usr/*bin/googleearth 2> /dev/null)
-$(ls /usr/share/applications/*googleearth*.desktop)
-/usr/share/applications/defaults.list
-$(ls -d /usr/*/google-earth)
-EOT
-cat > google-earth-$VERSION/receipt <<EOT
-PACKAGE="google-earth"
+# Prepare metadata for SliTaz package
+sed '/^Description:/,$!d; /^Description:/d' $PACKAGE/meta/control \
+	> $PACKAGE/description.txt
+
+SHORT_DESC="$(sed '/^Description:/!d; s/.*: //' $PACKAGE/meta/control)"
+MAINTAINER="$(sed '/^Maintainer:/!d;  s/.*: //' $PACKAGE/meta/control)"
+VERSION="$(   sed '/^Version:/!d;     s/.*: //' $PACKAGE/meta/control)"
+VERSION=${VERSION%-*}	# remove -r* suffix
+ 
+mv $PACKAGE $PACKAGE-$VERSION
+
+cd $PACKAGE-$VERSION
+
+# Create recipe for SliTaz package
+cat > receipt <<EOT
+# SliTaz package receipt.
+
+PACKAGE="$PACKAGE"
 VERSION="$VERSION"
-CATEGORY="non-free"
-SHORT_DESC="3D planet viewer."
-WEB_SITE="http://earth.google.com/"
+CATEGORY="$CATEGORY"
+TAGS="maps"
+SHORT_DESC="$SHORT_DESC"
+MAINTAINER="$MAINTAINER"
+LICENSE="non-free"
+WEB_SITE="$WEB_SITE"
+
 DEPENDS="$DEPENDS"
+
+post_install()
+{
+	# Due to different conventions in Debian
+	[ -L /lib/ld-lsb.so.3 ] || ln -s ld-2.14.1.so /lib/ld-lsb.so.3
+}
 EOT
 
+# Copy desktop file
+cp 	fs/opt/google/earth/pro/google-earth-pro.desktop \
+	fs/usr/share/applications/$PACKAGE.desktop
+
+cd $TMP_DIR
+
+action "Creating the package $PACKAGE..."
 # Pack
 tazpkg pack $PACKAGE-$VERSION
 
-# Clean to save RAM memory
+# Remove package tree
 rm -rf $PACKAGE-$VERSION
 
-# Install pseudo package
-tazpkg install google-earth-$VERSION.tazpkg --root=$ROOT
+#	=== Install the SliTaz package ===
+[ "$install" == "yes" ] &&
+tazpkg install $PACKAGE-$VERSION.tazpkg --root="$root"
 
-# Clean
+#	=== Cleanup ===
+# Preserve package file, if requested
+[ "$keep" == "yes" ] && mv $PACKAGE-$VERSION.tazpkg $CUR_DIR
+
+# Remove temporary build directory
 cd $CUR_DIR
 rm -rf $TMP_DIR
-