PHP 8 and MacOS TTTd.app fixes

Author: kimbtech

README.md

@@ -107,14 +107,14 @@ We have tested it under Linux Mint 18, macOS Catalina and Windows 10.
 We have an install and update script for macOS and Linux – [`install.sh`](install.sh).
 
 The script will follow these steps (for detailed information per operating system see below).
-1. Check the installation of PHP 7.4
+1. Check the installation of PHP (version 7.4 or newer)
 2. Ask the user where to install
 3. Use git to download the programs repository
 4. Add the `ttt` command to the shell
 5. Create an background job if on Linux
 
 ### Manual Installation
-1. Install PHP 7.4 (only the CLI component is needed)
+1. Install PHP 7.4 or newer (only the CLI component is needed)
     - On Linux install `yad` for dialogs
     - On Windows PHP-GTK will be used (and downloaded on first run of `./cli.php r`)
     - On macOS the dialog is a native program bundle shipped in this repository
@@ -156,7 +156,7 @@ The install script registers the `ttt-update` command (which reruns `install.sh`
 	`sudo apt-get install yad`
 #### macOS
 - PHP 7.4
-	- Until now PHP 7.3. is part of macOS, so `/usr/bin/php` will not work!
+	- Only PHP 7.3. is part of macOS, so `/usr/bin/php` will not work!
 	- Install Homebrew https://brew.sh/index
 	- Install `brew install php` or `brew install [email protected]`
 	- PHP will be installed to `/usr/local/Cellar/[email protected]/*/bin/php` or `/usr/local/Cellar/php/*/bin/php`
@@ -168,8 +168,8 @@ The install script registers the `ttt-update` command (which reruns `install.sh`
 		- The repository contains an `TTTd.app` it will start `record.php` as background process
 			- `TTTd.app` will only work, if you use Homebrew for the PHP installation
 			- Also `TTTd.app` looks for TTT at `~/Applications/TaskTimeTerminate/`
-	- Create own Automator Application instead of `TTTd.app`
-		- Open Automator.app and open a new Program
+	- Create own Automator Application as alternative to provided `TTTd.app`
+		- Start Automator.app and open a new Program
 		- Select *Execute Shell Command* and `/bin/sh` as Shell
 		- Add a command like this in the textbox on the right
 		- `/usr/local/Cellar/php/*/bin/php /Users/<me>/Applications/TaskTimeTerminate/record.php &> /dev/null &`
@@ -181,7 +181,7 @@ The install script registers the `ttt-update` command (which reruns `install.sh`
 	- Add to `$PATH` or always run like `C:/my/php/path/php.exe C:/Users/<me>/TaskTimeTerminate/cli.php`
 	- Enable the extension `sockets` (for autocompletion of tasks in the dialog) 
 		- Edit `C:/my/php/path/php.ini` (create there if not existent) to load the extension (it is part of the prebuilt PHP version)
-		- Make sure to have this two lines in it (i.e. remove `;` in from of each)
+		- Make sure to have this two lines in it (i.e. remove `;` in front of each)
 		```ini
 		extension_dir = "ext" 
 		extension = "php_sockets.dll"

TTTd.app/Contents/Info.plist

@@ -7,7 +7,7 @@
 	<key>AMStayOpen</key>
 	<false/>
 	<key>BuildMachineOSBuild</key>
-	<string>19A603003</string>
+	<string>19A603013</string>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<true/>
 	<key>CFBundleDevelopmentRegion</key>
@@ -60,11 +60,11 @@
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>11.0.1</string>
+	<string>11.1</string>
 	<key>DTSDKBuild</key>
-	<string>20B21</string>
+	<string>20C62</string>
 	<key>DTSDKName</key>
-	<string>macosx11.0internal</string>
+	<string>macosx11.1internal</string>
 	<key>DTXcode</key>
 	<string>1200</string>
 	<key>DTXcodeBuild</key>

TTTd.app/Contents/MacOS/Automator Application Stub

@@ -10,7 +10,7 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		wM6S0+6/Mly1+qq/QVfR5SW0Yrc=
+		6x486X/RjFLUxX/nTxPBfMGbmCo=
 		</data>
 		<key>Resources/en.lproj/InfoPlist.strings</key>
 		<dict>
@@ -39,11 +39,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			wM6S0+6/Mly1+qq/QVfR5SW0Yrc=
+			6x486X/RjFLUxX/nTxPBfMGbmCo=
 			</data>
 			<key>hash2</key>
 			<data>
-			AdGCOZF/5psqyrCHV5t3DhtFhEdGPJoUAyq50fYkkjk=
+			LnTju/BZ3F2CTA9e2XgciGp8jYhtkX/ez4o9EBeChzA=
 			</data>
 		</dict>
 		<key>Resources/en.lproj/InfoPlist.strings</key>
@@ -63,10 +63,10 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			Z7Aih50fn6mzWKRPrt42SybctAo=
+			dEpwdWqUYCU6HvGXM3CYyxnGNc4=
 			</data>
 			<key>requirement</key>
-			<string>cdhash H"a13e2c29912070d3ad09828714973d8052e77d46" or cdhash H"67b022879d1f9fa9b358a44faede364b26dcb40a"</string>
+			<string>cdhash H"f69436f95329fc55f0641c7c7eb27c62433ce321" or cdhash H"744a70756a9460253a1ef197337098cb19c635ce"</string>
 		</dict>
 	</dict>
 	<key>rules</key>

TTTd.app/Contents/_CodeSignature/CodeResources

@@ -59,32 +59,46 @@
 				<key>ActionParameters</key>
 				<dict>
 					<key>COMMAND_STRING</key>
-					<string>#!/bin/sh
+					<string>#!/bin/bash
 
-NOW=$(date +"%d.%m.%Y %T")
+# some settings
+curr_time=$(date +"%d.%m.%Y %T")
+daemon_log="/tmp/TaskTimeTerminateDeamon.log"
+search_path=(
+	/usr/local/Cellar/php@7*/7.4*/bin/php
+	/usr/local/Cellar/php@8*/*/bin/php
+	/usr/local/Cellar/php*/*/bin/php
+)
+php_binary="php"
 
-# brew path
-PHP=$(echo /usr/local/Cellar/php*/7.4*/bin/php);
-if ! "$PHP" -i | grep -q "7.4"; then
-	PHP="php"; # alternative
-fi;
+# look for php
+for path in ${search_path[*]}
+do
+	# get the path
+	php_cand=$(echo $path);
+	if [ -f "$php_cand" ]; then # check if exsists
+		if [ $("$php_cand" -r "echo version_compare(PHP_VERSION, '7.4', '&gt;=') ? 'ok' : 'error';") = "ok" ]; then # check version
+			php_binary="$php_cand" # remember found
+			break;
+		fi;
+	fi;
+done
 
 # final test
-if ! "$PHP" -i | grep -q "7.4" ; then
-	echo "Unable to find PHP 7.4 using '$PHP' at $NOW" &gt;&gt; /tmp/TaskTimeTerminateDeamon.log;
+if [ $("$php_binary" -r "echo version_compare(PHP_VERSION, '7.4', '&gt;=') ? 'ok' : 'error';") = "error" ]; then
+	echo "Unable to find PHP 7.4 or newer using '$php_binary' at $curr_time" &gt;&gt; $daemon_log;
 	exit;
 fi;
 
-echo "Starting with '$PHP' at $NOW" &gt;&gt; /tmp/TaskTimeTerminateDeamon.log;
-
 # start background job
-"$PHP" ~/Applications/TaskTimeTerminate/record.php &amp;&gt; /dev/null &amp;</string>
+echo "Starting with '$php_binary' at $curr_time" &gt;&gt; $daemon_log;
+"$php_binary" ~/Applications/TaskTimeTerminate/record.php &amp;&gt; /dev/null &amp;</string>
 					<key>CheckedForUserDefaultShell</key>
 					<true/>
 					<key>inputMethod</key>
 					<integer>0</integer>
 					<key>shell</key>
-					<string>/bin/sh</string>
+					<string>/bin/bash</string>
 					<key>source</key>
 					<string></string>
 				</dict>
@@ -191,7 +205,7 @@ echo "Starting with '$PHP' at $NOW" &gt;&gt; /tmp/TaskTimeTerminateDeamon.log;
 				<key>isViewVisible</key>
 				<true/>
 				<key>location</key>
-				<string>309.000000:252.000000</string>
+				<string>309.000000:598.000000</string>
 				<key>nibPath</key>
 				<string>/System/Library/Automator/Run Shell Script.action/Contents/Resources/Base.lproj/main.nib</string>
 			</dict>

TTTd.app/Contents/document.wflow

@@ -4,7 +4,7 @@
  */
 class Utilities {
 
-	const VERSION = 'v1.0.14';
+	const VERSION = 'v1.0.15';
 
 	const DEFAULT_LINE_LENGTH = 125;
 

core/Utilities.php

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# some settings
+curr_time=$(date +"%d.%m.%Y %T")
+daemon_log="/tmp/TaskTimeTerminateDeamon.log"
+search_path=(
+	/usr/local/Cellar/php@7*/7.4*/bin/php
+	/usr/local/Cellar/php@8*/*/bin/php
+	/usr/local/Cellar/php*/*/bin/php
+)
+php_binary="php"
+
+# look for php
+for path in ${search_path[*]}
+do
+	# get the path
+	php_cand=$(echo $path);
+	if [ -f "$php_cand" ]; then # check if exsists
+		if [ $("$php_cand" -r "echo version_compare(PHP_VERSION, '7.4', '>=') ? 'ok' : 'error';") = "ok" ]; then # check version
+			php_binary="$php_cand" # remember found
+			break;
+		fi;
+	fi;
+done
+
+# final test
+if [ $("$php_binary" -r "echo version_compare(PHP_VERSION, '7.4', '>=') ? 'ok' : 'error';") = "error" ]; then
+	echo "Unable to find PHP 7.4 or newer using '$php_binary' at $curr_time" >> $daemon_log;
+	exit;
+fi;
+
+# start background job
+echo "Starting with '$php_binary' at $curr_time" >> $daemon_log;
+"$php_binary" ~/Applications/TaskTimeTerminate/record.php &> /dev/null &

core/platform/macos/TTTd.sh

@@ -1,14 +1,15 @@
 #!/bin/sh
 
-# check for php 7.4
+# check for php
 if ! command -v php > /dev/null; then
 	echo "PHP not found!";
-	echo "Install PHP 7.4"
+	echo "Please install PHP 7.4 or newer!"
 	exit;
 fi;
 
-if ! php -v | grep -q "7.4" ; then
-	echo "PHP is not version 7.4!"
+# check php-version
+if [ $(php -r "echo version_compare(PHP_VERSION, '7.4', '>=') ? 'ok' : 'error';") = "error" ]; then
+	echo "TTT needs PHP version 7.4 or newer!"
 	exit;
 fi; 
 
@@ -38,7 +39,7 @@ if [ ! -f ./record.php ]; then
 	elif [ $(uname) = "Darwin" ]; then
 		installpath="$HOME/Applications/TaskTimeTerminate";
 	else
-		echo "Only Linux and macOS supported!"
+		echo "Only Linux and macOS supported by this script!"
 		exit;
 	fi;
 	echo "Install to '$installpath'? Type other absolute path or enter to use suggested."
@@ -58,7 +59,7 @@ if [ ! -d $installpath ]; then
 fi;
 cd "$installpath";
 if [ ! $(pwd) = $installpath ]; then 
-	echo "Error creating installpath '$installpath' path!"
+	echo "Error creating/ moving to installpath '$installpath'!"
 	exit;
 fi;
 
@@ -94,6 +95,16 @@ if [ -f ~/.zshrc ]; then
 	fi;
 fi;
 
+# setting up TTTd.app on macOS
+if [ $(uname) = "Darwin" ]; then 
+	if [ -d "$(pwd)/TTTd.app" ]; then
+		if [ "$(xattr "$(pwd)/TTTd.app")" = "com.apple.quarantine" ]; then 
+			xattr -d com.apple.quarantine "$(pwd)/TTTd.app"
+			echo "Removed quarantine lock on TTTd.app!"
+		fi;
+	fi;
+fi;
+
 echo "========================================================="
 echo "TaskTimeTerminate by KIMB-technologies                   "
 echo "	Installation/ Update successful!                   "
@@ -107,7 +118,7 @@ if [ $(uname) = "Linux" ]; then
 	echo "[Desktop Entry]" > ~/.config/autostart/TaskTimeTerminate.desktop
 	echo "Type=Application" >> ~/.config/autostart/TaskTimeTerminate.desktop
 	echo "Name=TaskTimeTerminate" >> ~/.config/autostart/TaskTimeTerminate.desktop
-	echo "Exec=$(command -v php7.4) $(pwd)/record.php" >> ~/.config/autostart/TaskTimeTerminate.desktop
+	echo "Exec=$(command -v php) $(pwd)/record.php" >> ~/.config/autostart/TaskTimeTerminate.desktop
 	echo "X-GNOME-Autostart-Delay=10" >> ~/.config/autostart/TaskTimeTerminate.desktop
 
 	echo "We have created an autostart into '~/.config/autostart/' "