Merge pull request #177 from dosza/v0.6.x

dosza · web-flow · commit b0cf2bdeb16e · 2024-02-06T01:32:33.000-03:00
v0.6.4
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # LAMW Manager
 
 
-[![Version](https://img.shields.io/badge/Release-v0.6.3-blue)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#v063---feb-5-2024) [![Build-status](https://img.shields.io/github/actions/workflow/status/dosza/LAMWManager-linux/main.yml?branch=v0.6.x)](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.3/lamw_manager_setup.sh) [![license](https://img.shields.io/github/license/dosza/LAMWManager-linux)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/LICENSE) [![Stars](https://img.shields.io/github/stars/dosza/LAMWManager-linux?style=default)](https://github.com/dosza/LAMWManager-linux/stargazers)
+[![Version](https://img.shields.io/badge/Release-v0.6.4-blue)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#latest) [![Build-status](https://img.shields.io/github/actions/workflow/status/dosza/LAMWManager-linux/main.yml?branch=v0.6.x)](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.4/lamw_manager_setup.sh) [![license](https://img.shields.io/github/license/dosza/LAMWManager-linux)](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/LICENSE) [![Stars](https://img.shields.io/github/stars/dosza/LAMWManager-linux?style=default)](https://github.com/dosza/LAMWManager-linux/stargazers)
 
 LAMW Manager is a command line tool,like *APT*, to automate the **installation**, **configuration** and **upgrade**<br/>the framework [LAMW - Lazarus Android Module Wizard](https://github.com/jmpessoa/lazandroidmodulewizard)
 
@@ -14,7 +14,7 @@ Linux Distro Supported:
 **Note**: Only Linux **x86_64** bits is supported!
 <p>
 	<ul>
-		<li><img src="https://www.debian.org/logos/openlogo-nd.svg" style="width: 16px;"/> Debian GNU/ Linux 12</li>
+		<li><img src="https://www.debian.org/logos/openlogo-nd.svg" style="width: 16px;"/> Debian 12</li>
 		<li><img src="https://assets.ubuntu.com/v1/29985a98-ubuntu-logo32.png" style="width: 16px;"/> Ubuntu 22.04 LTS</li>
 		<li><img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/35/Tux.svg/249px-Tux.svg.png" style="width: 16px;"/> <a href="https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/other-distros-info.md">Requirements for other Linux</a>
 			<ul>
@@ -53,12 +53,12 @@ LAMW Manager install the following [dependencies] tools:
 
 
 **Notes**
-1. The minimum Android API and Build Tools required by LAMW and specified in [*package.json*](https://github.com/jmpessoa/lazandroidmodulewizard/blob/v0.6.x/package.json) are installed 
+1. The minimum Android API and Build Tools required by LAMW and specified in [*package.json*](https://github.com/jmpessoa/lazandroidmodulewizard/blob/master/package.json) are installed 
 
 Getting Started!!
 ---
 **How to use LAMW Manager:**
-+	Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.3/lamw_manager_setup.sh)
++	Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.4/lamw_manager_setup.sh)
 +	Go to download directory and right click *Open in Terminal*
 +	Run command : *bash lamw_manager_setup.sh*¹
 
@@ -94,11 +94,11 @@ Recommended:
 
 Release Notes:
 ---
-For information on new features and bug fixes read the [*Release Notes*](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#v063---feb-5-2024)
+For information on new features and bug fixes read the [*Release Notes*](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/release_notes.md#latest)
 
 Congratulations!!
 ---
 You are now a Lazarus for Android developer!</br>[Building Android application with **LAMW** is **RAD**!](https://drive.google.com/open?id=1CeDDpuDfRwYrKpN7VHbossH6GfZUfqjm)
 
-For more info read [**LAMW Manager v0.6.3 Manual**](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/man.md)
+For more info read [**LAMW Manager v0.6.4 Manual**](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/man.md)
 
diff --git a/lamw_manager/assets/build-lamw-setup b/lamw_manager/assets/build-lamw-setup
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: This script generates compiles LAMW Manager source code into an executable installer.
 #Note: This script requires makeself, read more in https://makeself.io/
 #-------------------------------------------------------------------------------------------------#
diff --git a/lamw_manager/assets/get-releases-notes.sh b/lamw_manager/assets/get-releases-notes.sh
@@ -19,19 +19,20 @@ VERSION=$(
 INDEX_MATCH_V=0
 INDEX_END=0
 VERSION_REGEX="$(GenerateScapesStr "$VERSION")"
+REGEX_VERSION_DELIMITER='(^###)'
 
 arrayMap  RELEASES_NOTES_STREAM line index '
 	if [[ "$line" =~ $VERSION_REGEX ]]; then
 		INDEX_MATCH_V=$index
-		break
+		return
 	fi'
 
 RELEASES_NOTES_STREAM=(${RELEASES_NOTES_STREAM[@]:$INDEX_MATCH_V})
+
 arrayMap  RELEASES_NOTES_STREAM line index '
-	if [[ "$line" =~ "---" ]] && [ $index -gt $INDEX_MATCH_V ]; then
+	if [[ "$line" =~ $REGEX_VERSION_DELIMITER ]] && [ $index -gt $INDEX_MATCH_V ]; then
 		INDEX_END=$index
-		let INDEX_END-=1
-		break
+		return
 	fi'
 
 arraySlice RELEASES_NOTES_STREAM 0 $INDEX_END RELEASES_NOTES_STREAM_F
diff --git a/lamw_manager/core/cross-builder/cross-builder.sh b/lamw_manager/core/cross-builder/cross-builder.sh
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description:The "cross-builder.sh" is part of the core of LAMW Manager.  This script contains crosscompile compiler generation routines for ARMv7 / AARCH64- Android
 #-------------------------------------------------------------------------------------------------#
 
diff --git a/lamw_manager/core/headers/.init_lamw_manager.sh b/lamw_manager/core/headers/.init_lamw_manager.sh
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: The ".init_lamw_manager.sh" is part of the core of LAMW Manager. This script check conditions to init LAMW Manager
 #-------------------------------------------------------------------------------------------------#
 
diff --git a/lamw_manager/core/headers/.lamw_comple.sh b/lamw_manager/core/headers/.lamw_comple.sh
@@ -2,7 +2,7 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
+#Version: 0.6.4
 #Description: This script contains routines for completing LAMW Manager arguments.
 #Ref:https://www.vivaolinux.com.br/dica/Shell-script-autocompletion-Como-implementar
 #-------------------------------------------------------------------------------------------------#
diff --git a/lamw_manager/core/headers/lamw4linux_env.sh b/lamw_manager/core/headers/lamw4linux_env.sh
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
 #-------------------------------------------------------------------------------------------------#
 LAMW_IDE_HOME_CFG="$LAMW_USER_HOME/.lamw4linux"
diff --git a/lamw_manager/core/headers/lamw_headers b/lamw_manager/core/headers/lamw_headers
@@ -2,16 +2,16 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
 #-------------------------------------------------------------------------------------------------#
 
 #--------------------------------------------------------------------------------------------------
 #										Section Version Variables
 #--------------------------------------------------------------------------------------------------
 
-LAMW_INSTALL_VERSION="0.6.3"
+LAMW_INSTALL_VERSION="0.6.4"
 ANT_VERSION_STABLE='1.10.11'
 CMD_SDK_TOOLS_VERSION="9123335"
 CMD_SDK_TOOLS_VERSION_STR="8.0"
@@ -51,7 +51,7 @@ OLD_LAZARUS_STABLE_VERSION=(
 )
 
 OLD_LAMW_INSTALL_VERSION=(
-	0.6.{2..0}
+	0.6.{3..0}
 	0.5.9{.{2..1},}
 	0.5.{8..0}
 	0.4.{8..4}
diff --git a/lamw_manager/core/headers/parser.sh b/lamw_manager/core/headers/parser.sh
@@ -1,9 +1,16 @@
 #!/usr/bin/env bash
 
+setLAMWManagerRunStr(){
+	LAMW_MANAGER_RUN="./lamw_manager"
+	if [ "$USE_SETUP" = "1" ]; then
+		LAMW_MANAGER_RUN="bash lamw_manager_setup.sh"
+	fi
+}
+
 lamw_manager_help(){
-	local lamw_mgr="./lamw_manager"
+	local lamw_mgr="$LAMW_MANAGER_RUN"
 	if [ "$USE_SETUP" = "1" ]; then
-		lamw_mgr="bash lamw_manager_setup.sh\t${VERDE}--${NORMAL}"
+		lamw_mgr="$LAMW_MANAGER_RUN\t${VERDE}--${NORMAL}"
 	fi
 
 	LAMW_OPTS=(
@@ -243,9 +250,9 @@ helloMessage(){
 	local style3=$'\e[1;'$italic'm'
 	local version_message="${style3}v${LAMW_INSTALL_VERSION}${NORMAL}"
 
-	local lamw_mgr="./lamw_manager"
+	local lamw_mgr="$LAMW_MANAGER_RUN"
 	if [ "$USE_SETUP" = "1" ]; then
-		lamw_mgr="bash lamw_manager_setup.sh\t${VERDE}--${NORMAL}"
+		lamw_mgr="$LAMW_MANAGER_RUN\t${VERDE}--${NORMAL}"
 	fi
 
 	if [ $NOBLINK =  0 ]; then 
@@ -273,6 +280,7 @@ parseOpts(){
 }
 
 initialConfig(){
+	setLAMWManagerRunStr
 	setSignalHandles
 	parseOpts
 	helloMessage 1>&2
diff --git a/lamw_manager/core/installer/installer.sh b/lamw_manager/core/installer/installer.sh
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (Alma Mater)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: "installer.sh" is part of the core of LAMW Manager. Contains routines for installing LAMW development environment
 #-------------------------------------------------------------------------------------------------#
 
diff --git a/lamw_manager/core/lamw-mgr-core-os.sh b/lamw_manager/core/lamw-mgr-core-os.sh
@@ -46,7 +46,7 @@ checkRootLAMWInitStatus(){
 
 	if [ -e $parent ];then
 		if [ -O $parent ]; then
-				initROOT_LAMW
+			initROOT_LAMW
 		fi
 	fi
 
@@ -92,10 +92,15 @@ mainInstall(){
 }
 
 LAMW4LinuxPostConfig(){
+	if [ -e  "$LAMW_MANAGER_CORE_LOCK" ]; then 
 		IsFileBusy  "postInstall actions" "$LAMW_MANAGER_CORE_LOCK" 
 		enableADBtoUdev
+	fi
+
+	if [ -e "$CROSSBIN_LOCK" ]; then 
 		IsFileBusy "crossbinLock" "$CROSSBIN_LOCK"
 		CleanOldCrossCompileBins
+	fi
 }
 
 
diff --git a/lamw_manager/core/settings-editor/lamw-settings-editor.sh b/lamw_manager/core/settings-editor/lamw-settings-editor.sh
@@ -2,8 +2,8 @@
 #-------------------------------------------------------------------------------------------------#
 #Universidade federal de Mato Grosso (mater-alma)
 #Course: Science Computer
-#Version: 0.6.3
-#Date: 02/04/2024
+#Version: 0.6.4
+#Date: 02/06/2024
 #Description: The "lamw-manager-settings-editor.sh" is part of the core of LAMW Manager. Responsible for managing LAMW Manager / LAMW configuration files..
 #-----------------------------------------------------------------------f--------------------------#
 
@@ -339,6 +339,12 @@ LAMW4LinuxPostConfig(){
 		ln -s "$LAMW_IDE_HOME/startlamw4linux" "$LAMW_USER_HOME/.local/bin/startlamw4linux"
 	fi
 
+	if [ -e  "$LAMW_USER_HOME/.local/bin/lamw4linux-terminal" ]; then
+		rm "$LAMW_USER_HOME/.local/bin/lamw4linux-terminal"
+	fi 
+
+	ln -s "$LAMW4LINUX_TERMINAL_EXEC_PATH" "$LAMW_USER_HOME/.local/bin/lamw4linux-terminal"
+	
 	if [ $IS_DEBIAN = 0 ]; then  
 		CheckIfSystemNeedTerminalMitigation
 		SystemTerminalMitigation 
@@ -484,6 +490,7 @@ CleanOldConfig(){
 		"/usr/lib/fpc/$FPC_VERSION/fpmkinst/arm-android"
 		"/usr/bin/startlamw4linux"
 		"$LAMW_USER_HOME/.local/bin/startlamw4linux"
+		"$LAMW_USER_HOME/.local/bin/lamw4linux-terminal"
 		"$FPC_CFG_PATH"
 		"$LAMW_IDE_HOME_CFG"
 		"$ROOT_LAMW"
diff --git a/lamw_manager/docs/release_notes.md b/lamw_manager/docs/release_notes.md
diff --git a/lamw_manager/lamw_manager b/lamw_manager/lamw_manager
diff --git a/lamw_manager/tests/parse-tests.sh b/lamw_manager/tests/parse-tests.sh
