Fixed BIN Downloader Script with .env file

Author: ip2location

README.md

@@ -118,7 +118,7 @@ You can also sign up for [IP2Location Web Service](https://www.ip2location.com/w
 
 ## BIN DOWNLOADER SCRIPT
 ```
-php ip2location_bin_download.php --token DOWNLOAD_TOKEN --file DATABASE_CODE
+php ip2location_bin_download.php --token DOWNLOAD_TOKEN --file DATABASE_CODE -y
 ```
 
 The command above will download the DATABASE_CODE BIN file and unzip the file into *data* folder.
@@ -127,8 +127,9 @@ The command above will download the DATABASE_CODE BIN file and unzip the file in
 |---|---|
 |token|Download token. You can get your token at your [IP2Location Account Area](https://www.ip2location.com/account) at the Download page.|
 |file|Database package. (DB1BIN...DB26BIN, DB1BINIPV6...DB26BINIPV6, DB1LITEBIN...DB11LITEBIN or DB1LITEBINIPV6...DB11LITEBINIPV6) You may login to your [IP2Location Account Area](https://www.ip2location.com/account) and get the package code (or download code) at the Download page. |
+|y|Auto replace the current BIN file without acknowledgement.|
 
-You can set the **DOWNLOAD_TOKEN** and **DATABASE_CODE** with values in the .env file and run the command `php ip2location_bin_download.php` for the download.
+You can set the **DOWNLOAD_TOKEN** and **DATABASE_CODE** with values in the .env file (same path as *ip2location_bin_download.php*) and run the command `php ip2location_bin_download.php` for the download.
 
 ## IPv4 BIN vs IPv6 BIN
 * Use the IPv4 BIN file if you just need to query IPv4 addresses.

ip2location_bin_download.php

@@ -15,12 +15,13 @@
 define('DBTEMP', ROOT . 'dbtemp' . DS);
 
 
-$shortOpt = "";
+$shortOpt = "y";
 $longOpt = ["token:", "file:"];
 $inputs = getopt($shortOpt, $longOpt);
 
 $token = '';
 $dbCode = '';
+$passReplace = false;
 $fileName = '';
 $fileNameDwld = '';
 $fileSize = 0;
@@ -33,6 +34,10 @@
     $dbCode = $inputs["file"];
 }
 
+if(isset($inputs["y"])) {
+    $passReplace = true;
+}
+
 $envFilePath = realpath(ROOT . ".env");
 $varArr = [];
 if (is_file($envFilePath)) {
@@ -379,7 +384,11 @@
 }
 
 if ($fileName != '') {
-    $action = readline('The ' . substr($fileName, 0, -4) . ' file inside the data folder will be replaced. Would you like to proceed? (y/n): ');
+    if ($passReplace) {
+        $action = 'y';
+    } else {
+        $action = readline('The ' . substr($fileName, 0, -4) . ' file inside the data folder will be replaced. Would you like to proceed? (y/n): ');
+    }
 } else {
     echo "[Error] Unknown --file command line parameter.\n";
     exit;
@@ -454,7 +463,7 @@
     rmdir(DBTEMP);
     unlink($fileName);
 
-    echo "[Success] The " . substr($fileName, 0, -4) . " file has been successfully downloaded into data folder.\n";
+    echo "[Success] The " . substr($fileName, 0, -4) . " file has been successfully downloaded into the data folder.\n";
 } else {
     exit;
 }

src/Database.php

@@ -12,7 +12,7 @@ class Database
 	 *
 	 * @var string
 	 */
-	public const VERSION = '9.6.0';
+	public const VERSION = '9.6.1';
 
 	/**
 	 * Unsupported field message.