slitaz-tools diff tinyutils/frugal @ rev 939

tazbox: fix subox icon when ~/.local/share/applications is absent; fix working with freegeoip; write full list of icons used; all other files: 2015 and insert blank lines.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Apr 17 07:35:02 2015 +0300 (2015-04-17)
parents a4f64dd9b359
children 3be081525506
line diff
     1.1 --- a/tinyutils/frugal	Wed Mar 19 19:27:02 2014 +0100
     1.2 +++ b/tinyutils/frugal	Fri Apr 17 07:35:02 2015 +0300
     1.3 @@ -2,29 +2,36 @@
     1.4  #
     1.5  # Frugal is a tiny tool to handle SliTaz frugal installation.
     1.6  #
     1.7 -# Copyright (C) 2013 SliTaz GNU/Linux - BSD License
     1.8 +# Copyright (C) 2013-2015 SliTaz GNU/Linux - BSD License
     1.9  #
    1.10  # Author: Christophe Lincoln <pankso@slitaz.org>
    1.11  #
    1.12 +
    1.13  . /lib/libtaz.sh
    1.14  
    1.15  [ "$root" ] || root="/boot/frugal"
    1.16  
    1.17 +
    1.18  # NOTES:
    1.19  #	Have a --web option to dl ISO ?
    1.20  #	Auto configure GRUB ?
    1.21  #
    1.22  
    1.23 +
    1.24  # Internationalization
    1.25 +
    1.26  . /usr/bin/gettext.sh
    1.27  TEXTDOMAIN='slitaz-tools'
    1.28  export TEXTDOMAIN
    1.29  
    1.30 +
    1.31  #
    1.32  # Functions
    1.33  #
    1.34  
    1.35 +
    1.36  # Small help and usage.
    1.37 +
    1.38  usage() {
    1.39  	name=$(basename $0)
    1.40  	cat << EOT
    1.41 @@ -49,7 +56,9 @@
    1.42  EOT
    1.43  }
    1.44  
    1.45 +
    1.46  # GRUB config example.
    1.47 +
    1.48  grub_example() {
    1.49  	cat << EOT
    1.50  title SliTaz GNU/Linux (frugal)
    1.51 @@ -59,6 +68,7 @@
    1.52  EOT
    1.53  }
    1.54  
    1.55 +
    1.56  #
    1.57  # Commands
    1.58  #
    1.59 @@ -69,6 +79,7 @@
    1.60  		newline
    1.61  		boldify "Frugal info"
    1.62  		separator 
    1.63 +
    1.64  		# First check if we are running in frugal mode
    1.65  		if fgrep -q 'root=/dev/null' /proc/cmdline; then
    1.66  			gettext "Frugal system running detected"; newline
    1.67 @@ -127,6 +138,7 @@
    1.68  			cp -a ${loop}/boot/rootfs.gz ${root}
    1.69  		fi
    1.70  		status
    1.71 +
    1.72  		# Umount the loop device
    1.73  		gettext "Unmounting ISO image..."
    1.74  		sleep 1