rpms/ardour/devel ardour.script,1.1,1.2 ardour.spec,1.10,1.11

[Anthony Green (green)]

Author: green

Update of /cvs/extras/rpms/ardour/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8894

Modified Files:
	ardour.script ardour.spec 
Log Message:
Fix script.



Index: ardour.script
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour.script	22 Jan 2008 07:30:45 -0000	1.1
+++ ardour.script	22 Jan 2008 22:09:11 -0000	1.2
@@ -1,12 +1,23 @@
 #!/bin/sh
 
-FLAG=~/.ardour2/ardourver2.2
+A2DIR=~/.ardour2
 
-if ! test -a $FLAG; then
-   rm -f ~/.ardour2/ardour2_ui.rc
-   rm -f ~/.ardour2/ardour2_ui.conf
-   rm -f ~/.ardour2/ardour.bindings
-   touch $FLAG
+if ! test -d $A2DIR; then
+  mkdir -p $A2DIR
+  touch $A2DIR/ardourver2.2
+else
+  if ! test -a $A2DIR/ardourver2.2; then
+    if test -a $A2DIR/ardour2_ui.rc; then
+      mv -f $A2DIR/ardour2_ui.rc $A2DIR/ardour2_ui.rc.bak
+    fi
+    if test -a $A2DIR/ardour2_ui.conf; then
+      mv -f $A2DIR/ardour2_ui.conf $A2DIR/ardour2_ui.conf.bak
+    fi
+    if test -a $A2DIR/ardour.bindings; then
+      mv -f $A2DIR/ardour.bindings $A2DIR/ardour.bindings.bak
+    fi
+    touch $A2DIR/ardourver2.2
+  fi
 fi
 
 exec /usr/libexec/ardour2 "$@"


Index: ardour.spec
===================================================================
RCS file: /cvs/extras/rpms/ardour/devel/ardour.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ardour.spec	22 Jan 2008 07:30:45 -0000	1.10
+++ ardour.spec	22 Jan 2008 22:09:11 -0000	1.11
@@ -1,7 +1,7 @@
 Summary:       Multichannel Digital Audio Workstation
 Name:          ardour
 Version:       2.2
-Release:       1%{?dist}
+Release:       2%{?dist}
 Source:        http://ardour.org/files/releases/ardour-%{version}.tar.bz2
 Source1:       ardour2.desktop
 Source2:       ardour.script
@@ -157,6 +157,9 @@
 %{_datadir}/applications/fedora-ardour2.desktop
 
 %changelog
+* Tue Jan 22 2008 Anthony Green <green at redhat.com> 2.2-2
+- Fix wrapper script.
+
 * Thu Jan 17 2008 Anthony Green <green at redhat.com> 2.2-1
 - Upgrade to ardour 2.2.  Wrap executable in a script.