Do not depend on the order of files in a folder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
nextcloud · Sep 15, 2020 · bfdc40b · bfdc40b
1 parent d0ca75d
commit bfdc40b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/index.php b/index.php
@@ -692,14 +692,14 @@ private function getDownloadedFilePath() {
 		$this->silentLog('[info] storage location: ' . $storageLocation);
 
 		$filesInStorageLocation = scandir($storageLocation);
-		$files = array_filter($filesInStorageLocation, function($path){
+		$files = array_values(array_filter($filesInStorageLocation, function($path){
 			return $path !== '.' && $path !== '..';
-		});
+		}));
 		// only the downloaded archive
 		if(count($files) !== 1) {
 			throw new \Exception('There are more files than the downloaded archive in the downloads/ folder.');
 		}
-		return $storageLocation . '/' . $files[2];
+		return $storageLocation . '/' . $files[0];
 	}
 
 	/**

diff --git a/lib/Updater.php b/lib/Updater.php
@@ -575,14 +575,14 @@ private function getDownloadedFilePath() {
 		$this->silentLog('[info] storage location: ' . $storageLocation);
 
 		$filesInStorageLocation = scandir($storageLocation);
-		$files = array_filter($filesInStorageLocation, function($path){
+		$files = array_values(array_filter($filesInStorageLocation, function($path){
 			return $path !== '.' && $path !== '..';
-		});
+		}));
 		// only the downloaded archive
 		if(count($files) !== 1) {
 			throw new \Exception('There are more files than the downloaded archive in the downloads/ folder.');
 		}
-		return $storageLocation . '/' . $files[2];
+		return $storageLocation . '/' . $files[0];
 	}
 
 	/**