From 2ff61686d18b6563a61791981b90fe6a1b9164bf Mon Sep 17 00:00:00 2001 From: momo <> Date: Sun, 28 Jan 2007 18:53:45 +0000 Subject: [PATCH] Fixed wrong install directory (ticket 1), thanks to Olivier --- install.py | 18 +++++++++--------- telemeta.py | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/install.py b/install.py index e258d919..0b409212 100755 --- 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 83fd72e8..092d492e 100755 --- a/telemeta.py +++ b/telemeta.py @@ -3,7 +3,7 @@ """ telemeta - Copyright (c) 2006-2007 Guillaume Pellerin + Copyright (c) 2006-2007 Guillaume Pellerin 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 " + print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin >" 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 \n" + print " Copyright (c) 2006 Guillaume Pellerin \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 \n" + print " Guillaume Pellerin \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 " + print "telemeta v"+str(version)+" (c) 2006 Guillaume Pellerin " 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 -- 2.39.5