Kaynağa Gözat

Fully remove the deprecated global path. It only hurts us now.

Zachary Kotlarek 11 yıl önce
ebeveyn
işleme
26072c8c6a
2 değiştirilmiş dosya ile 8 ekleme ve 19 silme
  1. 7 9
      mediaPath
  2. 1 10
      mountMedia

+ 7 - 9
mediaPath

@@ -6,16 +6,14 @@ if [ "`basename "${0}"`" == 'isMediaMounted' ]; then
 	SILENT=1
 fi
 
-# Check the possible paths
-for i in "${HOME}/media/TV" "/mnt/media/TV"; do
-	if [ -d "${i}" ]; then
-		if [ $SILENT -le 0 ]; then
-			dir="`dirname "${i}"`"
-			echo -n "${dir}"
-		fi
-		exit 0
+# Exit cleanly if the TV path exists
+MEDIA="${HOME}/media"
+if [ -d "${MEDIA}/TV" ]; then
+	if [ $SILENT -le 0 ]; then
+		echo -n "${MEDIA}"
 	fi
-done
+	exit 0
+fi
 
 # Return false if we don't find anything
 exit 1

+ 1 - 10
mountMedia

@@ -57,13 +57,6 @@ function findMedia {
 
 function writeLinks {
 	DEST="${1}"
-	if [ -d /mnt ] && touch /mnt/media.writeTest >/dev/null 2>&1; then
-		rm -f /mnt/media.writeTest
-		if [ -e /mnt/media ] || [ -h /mnt/media ]; then
-				rm -f /mnt/media
-		fi
-		ln -s "${DEST}" /mnt/media
-	fi
 	if [ -e "${HOME}/media" ] || [ -h "${HOME}/media" ]; then
 		rm -f "${HOME}/media"
 		ln -s "${DEST}" "${HOME}/media"
@@ -71,9 +64,7 @@ function writeLinks {
 }
 
 # Determine if we have a remote link
-if [ -h /mnt/media ] && readlink /mnt/media | grep -qE "^${LOCAL_MEDIA}"; then
-	LOCAL_LINK=1
-elif [ -h "${HOME}/media" ] && readlink "${HOME}/media" | grep -qE "^${LOCAL_MEDIA}"; then
+if [ -h "${HOME}/media" ] && readlink "${HOME}/media" | grep -qE "^${LOCAL_MEDIA}"; then
 	LOCAL_LINK=1
 fi