From f15f69d7a967c81956aa62b1c18a83aa5a510f36 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Mon, 3 May 2010 01:14:27 +0100 Subject: [PATCH] fix crashes due to incomplete renaming --- SparkleShare/SparkleShareUI.cs | 4 +-- sparkleshare | 48 +++++++++++++++++----------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/SparkleShare/SparkleShareUI.cs b/SparkleShare/SparkleShareUI.cs index bb2c5b6f..d6e2844b 100644 --- a/SparkleShare/SparkleShareUI.cs +++ b/SparkleShare/SparkleShareUI.cs @@ -53,7 +53,7 @@ namespace SparkleShare { Process.StartInfo.FileName = "gvfs-set-attribute"; Process.StartInfo.Arguments = ReposPath + " metadata::custom-icon " + - "folder-sparkleshare"; + "file://usr/share/icons/hicolor/48x48/places/folder-sparkleshare"; Process.Start(); } @@ -114,4 +114,4 @@ namespace SparkleShare { } -} \ No newline at end of file +} diff --git a/sparkleshare b/sparkleshare index 238807fa..5ecfc3a8 100644 --- a/sparkleshare +++ b/sparkleshare @@ -1,57 +1,57 @@ #!/bin/bash # Create a directory to save the pid to -mkdir -p /tmp/sparklepony/ +mkdir -p /tmp/sparkleshare/ if [[ "$1" == "start" ]]; then - if [ -e "/tmp/sparklepony/sparklepony.pid" ]; then - echo "SparklePony is already running." + if [ -e "/tmp/sparkleshare/sparkleshare.pid" ]; then + echo "SparkleShare is already running." else - echo -n "Starting SparklePony..." + echo -n "Starting SparkleShare..." - # Start SparklePony in the background and save the pid - mono /usr/local/share/sparklepony/SparklePony.exe $2 & + # Start SparkleShare in the background and save the pid + mono /usr/local/share/sparkleshare/SparkleShare.exe $2 & PID=$! - echo $PID > /tmp/sparklepony/sparklepony.pid + echo $PID > /tmp/sparkleshare/sparkleshare.pid echo " Done." fi fi if [[ "$1" == "stop" ]]; then - if [ -e "/tmp/sparklepony/sparklepony.pid" ]; then - echo -n "Stopping SparklePony..." - kill `cat /tmp/sparklepony/sparklepony.pid` - rm -f /tmp/sparklepony/sparklepony.pid + if [ -e "/tmp/sparkleshare/sparkleshare.pid" ]; then + echo -n "Stopping SparkleShare..." + kill `cat /tmp/sparkleshare/sparkleshare.pid` + rm -f /tmp/sparkleshare/sparkleshare.pid echo " Done." else - echo "SparklePony isn't running." + echo "SparkleShare isn't running." fi fi if [[ "$1" == "restart" ]]; then - if [ -e "/tmp/sparklepony/sparklepony.pid" ]; then - echo -n "Stopping SparklePony..." - kill `cat /tmp/sparklepony/sparklepony.pid` - rm -f /tmp/sparklepony/sparklepony.pid + if [ -e "/tmp/sparkleshare/sparkleshare.pid" ]; then + echo -n "Stopping SparkleShare..." + kill `cat /tmp/sparkleshare/sparkleshare.pid` + rm -f /tmp/sparkleshare/sparkleshare.pid echo " Done." else - echo "SparklePony isn't running." + echo "SparkleShare isn't running." fi - if [ -e "/tmp/sparklepony/sparklepony.pid" ]; then - echo "SparklePony is already running." + if [ -e "/tmp/sparkleshare/sparkleshare.pid" ]; then + echo "SparkleShare is already running." else - echo -n "Starting SparklePony..." + echo -n "Starting SparkleShare..." - # Start SparklePony in the background and save the pid - mono /usr/local/share/sparklepony/SparklePony.exe $2 & + # Start SparkleShare in the background and save the pid + mono /usr/local/share/sparkleshare/SparkleShare.exe $2 & PID=$! - echo $PID > /tmp/sparklepony/sparklepony.pid + echo $PID > /tmp/sparkleshare/sparkleshare.pid echo " Done." fi fi if [[ "$1" == "--help" ]]; then - mono /usr/local/share/sparklepony/SparklePony.exe --help + mono /usr/local/share/sparkleshare/SparkleShare.exe --help fi