From 694c6899c5e93d05f0e820fcdb2062dd61027af3 Mon Sep 17 00:00:00 2001 From: kali Date: Tue, 28 Mar 2023 10:14:23 +0200 Subject: [PATCH 1/5] mkntfs v2014.2.15 --- config/bin_version_strings.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/config/bin_version_strings.cfg b/config/bin_version_strings.cfg index 781a3b588..2956596b6 100644 --- a/config/bin_version_strings.cfg +++ b/config/bin_version_strings.cfg @@ -417,6 +417,7 @@ fsck.fat;;gplv3;"^fsck\.fat\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fsck\.fat\ ([0-9]+(\ fatlabel;;gplv3;"^fatlabel\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fatlabel\ ([0-9]+(\.[0-9]+)+?).*/dosfstools:\1/'"; mklost_plus_found;;unknown;"^mklost\+found\ [0-9]+(\.[0-9]+)+?\ \(.*\)$";"sed -r 's/mklost\+found\ ([0-9]+(\.[0-9]+)+?).*/e2fsprogs:\1/'"; mkntfs;;gplv2;"mkntfs\ [0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'"; +mkntfs;;gplv2;"^mkntfs\ v[0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'"; mkpasswd;;unknown;"mkpasswd\ [0-9](\.[0-9]+)+?";"sed -r 's/mkpasswd\ ([0-9](\.[0-9]+)+?).*/mkpasswd:\1/'"; mkreiserfs;;unknown;"mkreiserfs\ [0-9](\.[0-9]+)+?$";"sed -r 's/mkreiserfs\ ([0-9](\.[0-9]+)+?)$/reiserfsck:\1/'"; modem;strict;unknown;"Version\ [0-9]\.[0-9]+\.[0-9]+";"sed -r 's/Version\ ([0-9](\.[0-9]+)+?)$/modem:\1/'"; From 5bb5a64b0af46cc059de1701283e0bd6ecfa3090 Mon Sep 17 00:00:00 2001 From: Endri Hoxha <44649246+HoxhaEndri@users.noreply.github.com> Date: Tue, 28 Mar 2023 15:42:20 +0200 Subject: [PATCH 2/5] pop os and similar /etc/os-release --- installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index b962073f9..6c6a33edc 100755 --- a/installer.sh +++ b/installer.sh @@ -158,7 +158,7 @@ if grep -q -i wsl /proc/version; then fi # distribution check -if ! grep -q "ID_LIKE=debian" /etc/os-release 2>/dev/null ; then +if ! grep -q "ID_LIKE="\"?"(ubuntu )"?debian"\"?$" /etc/os-release 2>/dev/null ; then echo -e "\\n""$RED""EMBA only supports debian based distributions!""$NC\\n" print_help exit 1 From 40b28c122073946305ca0b81747aba79464204ad Mon Sep 17 00:00:00 2001 From: Endri Hoxha <44649246+HoxhaEndri@users.noreply.github.com> Date: Tue, 28 Mar 2023 16:15:46 +0200 Subject: [PATCH 3/5] grep -Eq for /etc/os-release --- installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index 6c6a33edc..2f851ce96 100755 --- a/installer.sh +++ b/installer.sh @@ -158,7 +158,7 @@ if grep -q -i wsl /proc/version; then fi # distribution check -if ! grep -q "ID_LIKE="\"?"(ubuntu )"?debian"\"?$" /etc/os-release 2>/dev/null ; then +if ! grep -Eq "ID_LIKE="\"?"(ubuntu )"?debian"\"?$" /etc/os-release 2>/dev/null ; then echo -e "\\n""$RED""EMBA only supports debian based distributions!""$NC\\n" print_help exit 1 From 5854578ebbd3e3cc99e2189af4d7df9fe91c7b84 Mon Sep 17 00:00:00 2001 From: Endri Hoxha <44649246+HoxhaEndri@users.noreply.github.com> Date: Tue, 28 Mar 2023 21:41:52 +0200 Subject: [PATCH 4/5] update installer for checks --- installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer.sh b/installer.sh index 2f851ce96..690de4bb6 100755 --- a/installer.sh +++ b/installer.sh @@ -158,7 +158,7 @@ if grep -q -i wsl /proc/version; then fi # distribution check -if ! grep -Eq "ID_LIKE="\"?"(ubuntu )"?debian"\"?$" /etc/os-release 2>/dev/null ; then +if ! grep -Eq "ID_LIKE=(\")?(ubuntu)?( )?(debian)?" /etc/os-release 2>/dev/null ; then echo -e "\\n""$RED""EMBA only supports debian based distributions!""$NC\\n" print_help exit 1 From 415c7a42634d06757c752cdbe2520dc844bad325 Mon Sep 17 00:00:00 2001 From: kali Date: Mon, 3 Apr 2023 09:48:23 +0200 Subject: [PATCH 5/5] mkntfs one string and sed string --- config/bin_version_strings.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/bin_version_strings.cfg b/config/bin_version_strings.cfg index 2956596b6..2e268b375 100644 --- a/config/bin_version_strings.cfg +++ b/config/bin_version_strings.cfg @@ -416,8 +416,7 @@ mkdosfs;;gplv3;"^mkdosfs\ [0-9](\.[0-9]+)+?\ \([0-9]+\ .*\ [0-9]+\)$";"sed -r 's fsck.fat;;gplv3;"^fsck\.fat\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fsck\.fat\ ([0-9]+(\.[0-9]+)+?).*/dosfstools:\1/'"; fatlabel;;gplv3;"^fatlabel\ [0-9]+(\.[0-9]+)+?";"sed -r 's/fatlabel\ ([0-9]+(\.[0-9]+)+?).*/dosfstools:\1/'"; mklost_plus_found;;unknown;"^mklost\+found\ [0-9]+(\.[0-9]+)+?\ \(.*\)$";"sed -r 's/mklost\+found\ ([0-9]+(\.[0-9]+)+?).*/e2fsprogs:\1/'"; -mkntfs;;gplv2;"mkntfs\ [0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'"; -mkntfs;;gplv2;"^mkntfs\ v[0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ ([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'"; +mkntfs;;gplv2;"mkntfs\ (v)?[0-9]+(\.[0-9]+)+?";"sed -r 's/mkntfs\ v?([0-9]+(\.[0-9]+)+?).*/ntfsprogs:\1/'"; mkpasswd;;unknown;"mkpasswd\ [0-9](\.[0-9]+)+?";"sed -r 's/mkpasswd\ ([0-9](\.[0-9]+)+?).*/mkpasswd:\1/'"; mkreiserfs;;unknown;"mkreiserfs\ [0-9](\.[0-9]+)+?$";"sed -r 's/mkreiserfs\ ([0-9](\.[0-9]+)+?)$/reiserfsck:\1/'"; modem;strict;unknown;"Version\ [0-9]\.[0-9]+\.[0-9]+";"sed -r 's/Version\ ([0-9](\.[0-9]+)+?)$/modem:\1/'";