--- mozilla-linux-setup-0.3.2 Wed Nov 20 10:41:56 2002 +++ mozilla-linux-setup-0.3.3 Tue Nov 12 06:44:48 2002 @@ -1,7 +1,7 @@ #!/bin/bash echo # ---------------------------------------------------------------------------- -echo "Mozilla Setup Wizard for GNU/Linux 0.3.2" +echo "Mozilla Setup Wizard for GNU/Linux 0.3.3" echo "Copyright (c) 2002 Thomas Lahn " # # This program is free software; you can redistribute it and/or modify @@ -19,20 +19,36 @@ # Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # This is work in progress. Feel free to report any bugs. +# +# ChangeLog: +# +# 0.3.3 (2002-11-07) +# ------------------- +# * Added version sort support for archive path detection +# * First public release (GPL) +# +# 0.3.2 +# ------ +# * Now killing Mozilla before installing anything +# * First (private) release (GPL) +# # ---------------------------------------------------------------------------- function help { echo "Usage: `basename $0` [-? | -v] [src | -] [target | -]" echo " [-F [plugin_dir | -] [inst_path | -]] [-A [xpi_file] [...]]" +# version 0.3.4 proposal: +# echo " [-F [plugin_dir | -] [inst_path | -]" +# echo " [-C | -L | -H [-o] [src] [plugin_dir]] [-A [xpi_file] [...]]" echo echo "-?, --help Show this help page. Must be the first argument." echo "-v, --verbose Activate verbose mode. Must be the first argument." echo "src, - mozilla-installer *sea.t*gz archive path. Required." echo " Use - for the default (Mozilla Setup Wizard directory)." echo " Use 0 (zero) to skip the setup." - echo " If this argument can be resolved to a directory, the" - echo " first file in this directory that matches the pattern" - echo " 'mozilla*pc-linux*sea.t*gz' is used." + echo " If this argument can only be resolved to a directory, the" + echo " newest file in this directory is used (with version sort)" + echo " that matches the pattern \`mozilla*pc-linux*sea.t*gz'." echo "target, - User-defined directory where to store the setup directory." echo " If left out or -, the default (/tmp) will be used." echo " (Write access to the specified directory is required!)" @@ -41,10 +57,36 @@ echo " or use - for the default (/usr/local/mozilla/plugins)." echo " inst_path, - PE's Flash Plugin Installer path. Leave this out or use -" echo " for the default (./flash-linux-installer)." +# echo "-C, --copy Copy plugin files from another installation of Mozilla or" +# echo " Netscape. Mozilla will then be able to use those plugins" +# echo " independently of the 'source' browser." +# echo "-L, --link Do not copy plugin files but create symbolic links instead." +# echo " Note that plugins are no longer available for Mozilla if" +# echo " you eventually decide to deinstall the 'source' browser." +# echo "-H, --hardlink Do not copy plugin files but create hard links instead." +# echo " CAUTION! Removing one of those links will then remove the" +# echo " plugins from two or more browsers. Restrictions to hard" +# echo " links, such as containment to one file system, will also" +# echo " apply." +# echo " -o Overwrite existing files. The default is not to overwrite." +# echo " src, - Source plugin directory or file(s). If this is a directory," +# echo " all files in it will be copied to the specified plugin" +# echo " directory or (symbolic) links are created there for each" +# echo " file. If it is a file or a regular expression, only files" +# echo " with matching names are copied/linked to. Leave this out" +# echo " or use - for the default (/usr/local/netscape/plugins)," +# echo " which should make all Netscape plugins available for this" +# echo " Mozilla installation." +# echo " plugin_dir Mozilla plugin directory after installation. Leave this out" +# echo " for the default (/usr/local/mozilla/plugins). If -F was used" +# echo " before (with a plugin_dir option), that value or the default" +# echo " value is used instead and this option is ignored." echo "-A, --apps Install applications (plugins, add-ons). This must be the" echo " last option on the command line." - echo " xpi_file Cross-platform installation (*.xpi) file(s) for applications." - echo " Two or more installation files are separated by spaces." + echo " xpi_file Cross-platform installation (*.xpi) package(s) for applications." + echo " Two or more packages are separated by spaces." +# echo " The Setup Wizard will automagically try \`file.xpi' if \`file'" +# echo " does not exist." echo } @@ -174,7 +216,7 @@ if [ -d "$src" ]; then echo "directory: $src" echo -n "checking for archive... " - srcf=`(ls -1 $src/mozilla*pc-linux*sea.t*gz 2> /dev/null) | head -n 1 -` + srcf=`(ls -1vr $src/mozilla*pc-linux*sea.t*gz 2> /dev/null) | head -n 1 -` if [ -n "$srcf" ]; then echo "$srcf" src=$srcf @@ -298,4 +340,4 @@ echo echo Setup complete. echo -exit 255 \ No newline at end of file +exit 255