Fixed wrong install directory (ticket 1), thanks to Olivier

diff --git a/install.py b/install.py
index e258d91920e9da1d1cae9e299d5b889e3084605e..0b409212a3aee14eb6c0cbb10265b4ee2a62bfd7 100755 (executable)
--- a/install.py
+++ b/install.py
@@ -17,25 +17,25 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+# ONLY FO LINUX
+
 import os, sys
 
 if len(sys.argv) == 1:
-       install_dir = '/usr/'
+       install_dir = '/usr/share/telemeta/'
 else:
        install_dir = sys.argv[1]
 
 if not os.path.exists(install_dir):
        os.mkdir(install_dir)
-if not os.path.exists(install_dir+'/share/'):
-       os.mkdir(install_dir+'/share/')
-if not os.path.exists(install_dir+'/share/telemeta/'):
-       os.mkdir(install_dir+'/telemeta/')
 
-os.system('cp -ra ./* '+install_dir+'/share/telemeta/')
-os.system('rm -rf '+install_dir+'debian')
+os.system('cp -ra ./* '+install_dir+os.sep)
+os.system('rm -rf '+install_dir+os.sep+'debian')
+
+if os.path.exists('/usr/bin/telemeta'):
+       os.system('rm -r /usr/bin/telemeta')
 
-if not os.path.exists(install_dir+'/bin/telemeta'):
-       os.system('ln -s '+install_dir+'/share/telemeta/telemeta.py '+install_dir+'/bin/telemeta')
+os.system('ln -s '+install_dir+os.sep+'telemeta.py '+'/usr/bin/telemeta')
 
 print "Installation successfull ! Type 'telemeta' now..."
 

diff --git a/telemeta.py b/telemeta.py
index 83fd72e878485f3b7b7c751903911812fb89a8b6..092d492e3ed7cdca4032d8c9b897a13712602a16 100755 (executable)
--- a/telemeta.py
+++ b/telemeta.py
@@ -3,7 +3,7 @@
 """
    telemeta
 
-   Copyright (c) 2006-2007 Guillaume Pellerin <pellerin@parisson.com>
+   Copyright (c) 2006-2007 Guillaume Pellerin <yomguy@altern.org>
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@ from audio_tools import *
 # Info, error
 # ===========
 if len(sys.argv) == 1 :
-       print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin <pellerin@parisson.com>"
+       print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin <yomguy@altern.org>>"
        print "version: "+str(version)
        print "depends: python, python-xml, python-mutagen, sox, oggenc, flac, lame, normalize-audio, ecasound, wavbreaker, festival"
        print "distributed under the terms of the GNU Public License v2.\n"
@@ -60,7 +60,7 @@ elif sys.argv[1] == '--help':
        print "DEPENDS:"
        print "         python, python-xml, python-mutagen, sox, oggenc, flac, lame, normalize-audio, ecasound, wavbreaker, festival\n"
        print "COPYRIGHT:"
-       print "         Copyright (c) 2006 Guillaume Pellerin <pellerin@parisson.com>\n"
+       print "         Copyright (c) 2006 Guillaume Pellerin <yomguy@altern.org>\n"
        print "LICENSE:"
        print "         distributed under the terms of the GNU Public License v2.\n"
        print "USAGE:"
@@ -92,7 +92,7 @@ elif sys.argv[1] == '--help':
        print "         telemeta --backup my_collection --album --par2 --rsync /path/to/directory/"
        print "         telemeta --backup my_collection --album --par2 --rsync --force /path/to/directory/\n"
        print "AUTHOR:"
-       print "         Guillaume Pellerin <pellerin@parisson.com>\n"
+       print "         Guillaume Pellerin <yomguy@altern.org>\n"
        print "URL:"
        print "         http://yomix.org/telemeta\n"
        print 'IMPORTANT:'
@@ -102,14 +102,14 @@ elif sys.argv[1] == '--help':
        print "         Tags between [] are optional main tags.\n"
        print "FOR MORE INFORMATIONS :"
        print "         - read the README file"
-       print "         - go to http://yomix.org/telemeta"
+       print "         - go to http://svn.yomix.org/telemeta"
        sys.exit('         - email me !\n')
 
 elif sys.argv[1] == '--version':
        sys.exit('Version: '+str(version))
 
 else :
-       print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin <pellerin@parisson.com>"
+       print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin <yomguy@altern.org>"
        print """   This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the