SliTaz Repositories

     1.1 --- a/sup	Tue Feb 28 19:35:14 2017 +0100
     1.2 +++ b/sup	Tue Feb 28 20:35:45 2017 +0100
     1.3 @@ -31,15 +31,17 @@
     1.4  
     1.5  $(boldify $(gettext "Commands:"))
     1.6    -c  cook           $(gettext "Cook a package from the wok")
     1.7 +  -r  run            $(gettext "Run sup_install without installing")
     1.8    -e  extract        $(gettext "Extract a package to current dir")
     1.9    -i  install        $(gettext "Install a new package")
    1.10    -u  update         $(gettext "Update installed package")
    1.11    -r  remove         $(gettext "Remove package files")
    1.12 -  -n  new            $(gettext "Create a new package :-)")
    1.13 +  -n  new            $(gettext "Create a new SUP package :-)")
    1.14    -l  list           $(gettext "List installed packages in your wok")
    1.15  
    1.16  $(boldify $(gettext "Options:"))
    1.17 -  --install  update  $(gettext "Install updates")
    1.18 +  --install  update  $(gettext "Install all updates from mirror")
    1.19 +  --force    update  $(gettext "Force recharging packages database")
    1.20    --init     cook    $(gettext "Initialize sup cook environment")
    1.21    --verbose  all     $(gettext "Display more output messages")
    1.22  
    1.23 @@ -148,9 +150,9 @@
    1.24  		cp -rf ${wok}/${pkg} ${cache}/${supfile%.sup}
    1.25  		cd ${cache}/${supfile%.sup}
    1.26  		
    1.27 -		# Move to hidden dir: ~/.local and ~/.config
    1.28 -		for dir in local config; do
    1.29 -			mv files/${dir} files/.${dir}
    1.30 +		# Move to hidden dir: ~/.local ~/.config ~./icons
    1.31 +		for dir in local config icons; do
    1.32 +			[ -d "files/${dir}" ] && mv files/${dir} files/.${dir}
    1.33  		done
    1.34  		
    1.35  		# Add $build_date
    1.36 @@ -167,10 +169,11 @@
    1.37  		echo "$(gettext 'Packages:') $(colorize 035 $supfile) ($size)"
    1.38  		rm -rf ${cache} && newline ;;
    1.39  	
    1.40 -	run)
    1.41 +	-r|run)
    1.42  		# Run sup_install() without any installation to help package creation
    1.43  		pkg="$2"
    1.44  		receip="$wok/$pkg/receip"
    1.45 +		work="$supcook/sup_install"
    1.46  		
    1.47  		# Sanity check
    1.48  		check_pkg_arg "$1"
    1.49 @@ -179,11 +182,14 @@
    1.50  		fi
    1.51  		
    1.52  		newline
    1.53 -		echo "$(gettext 'Running') $(colorize 36 $pkg) $(colorize 035 sup_install)"
    1.54 +		echo "$(colorize 33 $(gettext 'Running') sup_install\(\):) $(colorize 35 $pkg)"
    1.55  		separator
    1.56 -		
    1.57 -		echo "To be continued"
    1.58 -		;;
    1.59 +		mkdir -p ${work} && cd ${work}
    1.60 +		. ${wok}/${pkg}/receip
    1.61 +		sup_install
    1.62 +		separator 
    1.63 +		gettext "Working folder:"; echo " $work"
    1.64 +		newline ;;
    1.65  	
    1.66  	-n|new)
    1.67  		pkg="$2"