Improved the Linux installer.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1415 0fc631ac-6414-0410-93d0-97cfa31319b6

tools/linux-installer/README

@@ -1,16 +1,21 @@
 In order to use Magic Set Editor, you need to have libraries for wxGTK version
 2.8. This can be acquired from the Ubuntu/Debian package libwxgtk2.8-0. If you
 are using another distribution, you can probably find the library in a package
-somewhere.
+somewhere. You also need Hunspell, which is in Ubuntu/Debian libhunspell-1.2-0.
+
+Due to wxWidgets sucking, there is a fair chance that this will not work out of
+the box on non-Ubuntu systems. If this is the case, please download the source
+package and compile it yourself.
 
 To install Magic Set Editor, please extract this tarball if you haven't already,
 and then run the install script. If run as root, it will install MSE to
-/usr/share/local/magicseteditor, if not, to ~/.magicseteditor.
+/usr/local/share/magicseteditor, if not, to ~/.magicseteditor. Fonts will be
+installed to /usr/local/share/fonts or to ~/.fonts.
 
 MSE will also place a symlink in either /usr/local/bin or ~/bin. They can be
 removed without affecting the install, and removing the installation directory
 will completely purge the system of MSE, except that some users' configuration
 files will still remain in ~/.magicseteditor for each user.
 
-Fonts are not included with MSE currently, you will have to seek those out
-yourself.
+You can override the installation, font, or symlink targets with the environment
+variables MSE_INSTALL_DIR, MSE_FONTS_DIR, and MSE_EXEC_SYMLINK respectively.

tools/linux-installer/install

@@ -11,15 +11,27 @@
 case $UID in
     0)
         INSTALL_DIR='/usr/local/share/magicseteditor/';
-        EXEC_SYMLINK='/usr/local/bin/magicseteditor';;
+        EXEC_SYMLINK='/usr/local/bin/magicseteditor';
+        FONTS_DIR='/usr/local/share/fonts/';;
     *)
         INSTALL_DIR='$HOME/.magicseteditor/';
         EXEC_SYMLINK='$HOME/bin/magicseteditor';
-esac;
+	FONTS_DIR='$HOME/.fonts/';;
+esac
 
+if [ "$MSE_INSTALL_DIR" != "" ]; then
+    INSTALL_DIR=$MSE_INSTALL_DIR
+fi
+if [ "$MSE_EXEC_SYMLINK" != "" ]; then
+    EXEC_SYMLINK=$MSE_EXEC_SYMLINK
+fi
+if [ "$MSE_FONTS_DIR" != "" ]; then
+    FONTS_DIR=$MSE_FONTS_DIR
+fi
 echo "Magic Set Editor version $VERSION Installer Script.
 
 Magic Set Editor will be installed to $INSTALL_DIR.
+Fonts will be installed to $FONTS_DIR.
 A symbolic link to the executable will be put at $EXEC_SYMLINK.
 
 Is this correct [y/N]? ";
@@ -37,5 +49,5 @@ echo "Installing...";
 
 mkdir "$INSTALL_DIR";
 cp -r program/* "$INSTALL_DIR";
-
+cp fonts/* "$FONTS_DIR";
 ln -s "$INSTALL_DIR/magicseteditor" "$EXEC_SYMLINK"

tools/linux-installer/tarball

@@ -3,9 +3,12 @@
 
 mkdir magicseteditor
 mkdir magicseteditor/program
+mkdir magicseteditor/fonts
 
 cp -rP ../../data ~/.magicseteditor/resource ../../magicseteditor magicseteditor/program;
 cp install README magicseteditor;
+cp limited-fonts/* magicseteditor/fonts;
+cp all-fonts/* magicseteditor/fonts;
 
 tar -cfz magicseteditor.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor;
 

tools/linux-installer/tarball-limited

@@ -5,7 +5,9 @@ rm -rf magicseteditor
 mkdir magicseteditor
 mkdir magicseteditor/program
 mkdir magicseteditor/program/data
+mkdir magicseteditor/fonts
 
+#TODO: parse the msw-installer to determine this.
 PACKAGES="magic.mse-game
 magic-blends.mse-include
 magic-default-image.mse-include
@@ -37,6 +39,7 @@ done;
 
 cp -rP ~/.magicseteditor/resource ../../magicseteditor magicseteditor/program;
 cp install README magicseteditor;
+cp limited-fonts/* magicseteditor/fonts;
 
 tar -cfz magicseteditor-limited.tar.gz --owner root --exclude=.* --exclude=*~ --exclude=.svn magicseteditor;