Skip to content

Commit 7522d29

Browse files
doszadosza
authored
Merge pull request #179 from dosza/v0.6.x
v0.6.6
2 parents caa9ac0 + 2103e95 commit 7522d29

File tree

15 files changed

+55
-57
lines changed

15 files changed

+55
-57
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# LAMW Manager
22

33

4-
[![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)
4+
[![Version](https://img.shields.io/badge/Release-v0.6.6-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.6/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)
55

66
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)
77

@@ -58,7 +58,7 @@ LAMW Manager install the following [dependencies] tools:
5858
Getting Started!!
5959
---
6060
**How to use LAMW Manager:**
61-
+ Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.4/lamw_manager_setup.sh)
61+
+ Click here to download [*LAMW Manager Setup*](https://github.com/dosza/LAMWManager-linux/releases/download/v0.6.6/lamw_manager_setup.sh)
6262
+ Go to download directory and right click *Open in Terminal*
6363
+ Run command : *bash lamw_manager_setup.sh*¹
6464

@@ -100,5 +100,5 @@ Congratulations!!
100100
---
101101
You are now a Lazarus for Android developer!</br>[Building Android application with **LAMW** is **RAD**!](https://drive.google.com/open?id=1CeDDpuDfRwYrKpN7VHbossH6GfZUfqjm)
102102

103-
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)
103+
For more info read [**LAMW Manager v0.6.6 Manual**](https://github.com/dosza/LAMWManager-linux/blob/v0.6.x/lamw_manager/docs/man.md)
104104

‎lamw_manager/assets/build-lamw-setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description: This script generates compiles LAMW Manager source code into an executable installer.
88
#Note: This script requires makeself, read more in https://makeself.io/
99
#-------------------------------------------------------------------------------------------------#

‎lamw_manager/assets/get-releases-notes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ arrayMap RELEASES_NOTES_STREAM line index '
3030
RELEASES_NOTES_STREAM=(${RELEASES_NOTES_STREAM[@]:$INDEX_MATCH_V})
3131

3232
arrayMap RELEASES_NOTES_STREAM line index '
33-
if [[ "$line" =~ $REGEX_VERSION_DELIMITER ]] && [ $index -gt $INDEX_MATCH_V ]; then
33+
if [[ "$line" =~ $REGEX_VERSION_DELIMITER ]] && [ $index -gt 0 ]; then
3434
INDEX_END=$index
3535
return
3636
fi'

‎lamw_manager/core/cross-builder/cross-builder.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description:The "cross-builder.sh" is part of the core of LAMW Manager. This script contains crosscompile compiler generation routines for ARMv7 / AARCH64- Android
88
#-------------------------------------------------------------------------------------------------#
99

‎lamw_manager/core/headers/.init_lamw_manager.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description: The ".init_lamw_manager.sh" is part of the core of LAMW Manager. This script check conditions to init LAMW Manager
88
#-------------------------------------------------------------------------------------------------#
99

‎lamw_manager/core/headers/.lamw_comple.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
5+
#Version: 0.6.6
66
#Description: This script contains routines for completing LAMW Manager arguments.
77
#Ref:https://www.vivaolinux.com.br/dica/Shell-script-autocompletion-Como-implementar
88
#-------------------------------------------------------------------------------------------------#

‎lamw_manager/core/headers/lamw4linux_env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
88
#-------------------------------------------------------------------------------------------------#
99
LAMW_IDE_HOME_CFG="$LAMW_USER_HOME/.lamw4linux"

‎lamw_manager/core/headers/lamw_headers

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description: The "lamw_headers" is part of the core of LAMW Manager. This script contains LAMW Manager variables.
88
#-------------------------------------------------------------------------------------------------#
99

1010
#--------------------------------------------------------------------------------------------------
1111
# Section Version Variables
1212
#--------------------------------------------------------------------------------------------------
1313

14-
LAMW_INSTALL_VERSION="0.6.5"
14+
LAMW_INSTALL_VERSION="0.6.6"
1515
ANT_VERSION_STABLE='1.10.11'
16-
CMD_SDK_TOOLS_VERSION="9123335"
17-
CMD_SDK_TOOLS_VERSION_STR="8.0"
16+
CMD_SDK_TOOLS_VERSION="11076708"
17+
CMD_SDK_TOOLS_VERSION_STR="12.0"
1818
LAZARUS_STABLE_VERSION="2.0.12"
1919
FPC_TRUNK_VERSION="3.2.2"
2020
FPC_LAZ_DEB_VERSION="2.0.12"
@@ -51,7 +51,7 @@ OLD_LAZARUS_STABLE_VERSION=(
5151
)
5252

5353
OLD_LAMW_INSTALL_VERSION=(
54-
0.6.{4..0}
54+
0.6.{5..0}
5555
0.5.9{.{2..1},}
5656
0.5.{8..0}
5757
0.4.{8..4}
@@ -159,7 +159,7 @@ declare -A FPC_DEB_SUM=(
159159
)
160160
declare -A CMD_SDK_TOOLS_ZIP_SUM=(
161161
['checksum_type']=sha256sum
162-
['sha256sum']='0bebf59339eaa534f4217f8aa0972d14dc49e7207be225511073c661ae01da0a'
162+
['sha256sum']='2d2d50857e4eb553af5a6dc3ad507a17adf43d115264b1afc116f95c92e5e258'
163163
)
164164
declare -A GRADLE_ZIP_SUM=(
165165
['checksum_type']=sha256sum

‎lamw_manager/core/headers/parser.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ TrapActions(){
8888
rm -r $file_deleted
8989
fi
9090
fi
91-
92-
rm "$LAMW_MANAGER_LOCK"
9391
}
9492

9593
handleSigTerm(){
@@ -109,6 +107,10 @@ handleSigInt(){
109107
exit 2
110108
}
111109

110+
handleExit(){
111+
deleteLamwManagerLock
112+
deleteCoreLock
113+
}
112114

113115
resetTrapActions(){
114116
MAGIC_TRAP_INDEX=-1
@@ -158,6 +160,7 @@ getCurrentSucessFiller(){
158160
setSignalHandles(){
159161
trap handleSigInt SIGINT
160162
trap handleSigTerm SIGTERM
163+
trap handleExit EXIT
161164
}
162165

163166
findUseProxyOpt(){

‎lamw_manager/core/installer/installer.sh

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#-------------------------------------------------------------------------------------------------#
33
#Universidade federal de Mato Grosso (Alma Mater)
44
#Course: Science Computer
5-
#Version: 0.6.5
6-
#Date: 02/11/2024
5+
#Version: 0.6.6
6+
#Date: 04/04/2024
77
#Description: "installer.sh" is part of the core of LAMW Manager. Contains routines for installing LAMW development environment
88
#-------------------------------------------------------------------------------------------------#
99

@@ -24,16 +24,7 @@ singleCoreWarning(){
2424
fi
2525
}
2626

27-
checkUnsupportedCmdlineTools(){
28-
local ret=1
29-
local unsupported_cmdlinetools_version=10
30-
local cmdline_tools_prop_path="$CMD_SDK_TOOLS_DIR/latest/source.properties"
31-
if [ -e $cmdline_tools_prop_path ]; then
32-
local cmdline_tools_query="$(grep Pkg.Revision= $cmdline_tools_prop_path | awk -F= ' { print $NF }' ) > $unsupported_cmdlinetools_version "
33-
local cmdline_tools_query_result=$(echo "$cmdline_tools_query" | bc)
34-
[ "$cmdline_tools_query_result" = "1" ] && ret=0
35-
fi
36-
}
27+
3728
checkOldCmdlineTools(){
3829
local ret=1
3930
local cmdline_tools_prop_path="$CMD_SDK_TOOLS_DIR/latest/source.properties"
@@ -51,7 +42,7 @@ resolvesCmdlineToolsConflicts(){
5142
rm -rf "$CMD_SDK_TOOLS_DIR/latest/package.xml"
5243
fi
5344

54-
if ( checkOldCmdlineTools || checkUnsupportedCmdlineTools ); then
45+
if checkOldCmdlineTools ; then
5546
if [ -e "$CMD_SDK_TOOLS_DIR/latest" ]; then
5647
rm -rf "$CMD_SDK_TOOLS_DIR/latest"
5748
fi

0 commit comments

Comments
 (0)