From fe3071ba5c6c2cf2141e30af344c789ddf20387e Mon Sep 17 00:00:00 2001
From: Rohan Shinde <37367348+shindebalu@users.noreply.github.com>
Date: Thu, 17 Jan 2019 12:00:08 +0530
Subject: [PATCH] Bug #139457 fix: Warning Install path does not exist. (#41)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bug #139457 fix: Warning Install path does not exist. Package Update: There was an error installing an extension: com_tjnotification.zip × Error Error installing package

* Bug #139457 fix: Warning Install path does not exist. Package Update: There was an error installing an extension: com_tjnotification.zip × Error Error installing package
---
 ...notification.php => install.tjnotifications.php} | 13 ++++---------
 ...tification.ini => en-GB.com_tjnotifications.ini} |  0
 src/com_tjnotifications/tjnotifications.xml         |  4 ++--
 3 files changed, 6 insertions(+), 11 deletions(-)
 rename src/com_tjnotifications/{install.tjnotification.php => install.tjnotifications.php} (97%)
 rename src/com_tjnotifications/site/language/{en-GB.com_tjnotification.ini => en-GB.com_tjnotifications.ini} (100%)

diff --git a/src/com_tjnotifications/install.tjnotification.php b/src/com_tjnotifications/install.tjnotifications.php
similarity index 97%
rename from src/com_tjnotifications/install.tjnotification.php
rename to src/com_tjnotifications/install.tjnotifications.php
index bc6cc99f..3ad73297 100644
--- a/src/com_tjnotifications/install.tjnotification.php
+++ b/src/com_tjnotifications/install.tjnotifications.php
@@ -31,7 +31,6 @@ class Com_TjnotificationsInstallerScript
 	/** @var array Obsolete files and folders to remove*/
 	private $removeFilesAndFolders = array(
 		'files' => array(
-			'administrator/components/com_tjnotifications/tjnotifications.xml'
 		),
 		'folders' => array(
 		)
@@ -395,12 +394,10 @@ private function removeObsoleteFilesAndFolders($removeFilesAndFolders)
 			{
 				$f = JPATH_ROOT . '/' . $file;
 
-				if (!JFile::exists($f))
+				if (JFile::exists($f))
 				{
-					continue;
+					JFile::delete($f);
 				}
-
-				JFile::delete($f);
 			}
 		}
 
@@ -411,12 +408,10 @@ private function removeObsoleteFilesAndFolders($removeFilesAndFolders)
 			{
 				$f = JPATH_ROOT . '/' . $folder;
 
-				if (!JFolder::exists($f))
+				if (JFolder::exists($f))
 				{
-					continue;
+					JFolder::delete($f);
 				}
-
-				JFolder::delete($f);
 			}
 		}
 	}
diff --git a/src/com_tjnotifications/site/language/en-GB.com_tjnotification.ini b/src/com_tjnotifications/site/language/en-GB.com_tjnotifications.ini
similarity index 100%
rename from src/com_tjnotifications/site/language/en-GB.com_tjnotification.ini
rename to src/com_tjnotifications/site/language/en-GB.com_tjnotifications.ini
diff --git a/src/com_tjnotifications/tjnotifications.xml b/src/com_tjnotifications/tjnotifications.xml
index ed83f49e..85073126 100644
--- a/src/com_tjnotifications/tjnotifications.xml
+++ b/src/com_tjnotifications/tjnotifications.xml
@@ -28,7 +28,7 @@
 		<folder>controllers</folder>
 	</files>
 	<languages folder="site/language">
-		<language tag="en-GB">en-GB.com_tjnotification.ini</language>
+		<language tag="en-GB">en-GB.com_tjnotifications.ini</language>
 	</languages>
 	<administration>
 		<menu>com_tjnotifications</menu>
@@ -49,5 +49,5 @@
 			<language tag="en-GB">en-GB.com_tjnotifications.sys.ini</language>
 		</languages>
 	</administration>
-	<scriptfile>install.tjnotification.php</scriptfile>
+	<scriptfile>install.tjnotifications.php</scriptfile>
 </extension>