diff --git a/Scripts/Common/Copy_Keys.sh b/Scripts/Common/Copy_Keys.sh index 147faadc..71c00f0a 100644 --- a/Scripts/Common/Copy_Keys.sh +++ b/Scripts/Common/Copy_Keys.sh @@ -19,24 +19,24 @@ set -uo pipefail; source "$DOS_SCRIPTS_COMMON/Shell.sh"; copyKey() { - if [[ -f "$DOS_SIGNING_KEYS/$1/verifiedboot_relkeys.der.x509" ]] && [[ -d "$DOS_BUILD_BASE/$2" ]]; then - if cp "$DOS_SIGNING_KEYS/$1/verifiedboot_relkeys.der.x509" "$DOS_BUILD_BASE/$2/verifiedboot_$1_dos_relkeys.der.x509"; then - echo -e "\e[0;32mCopied verifiedboot keys for $1 to $2\e[0m"; - else - echo -e "\e[0;33mCould not copy verifiedboot keys for $1\e[0m"; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]] && [[ -d "$DOS_BUILD_BASE/$2" ]]; then + if [[ -f "$DOS_SIGNING_KEYS/$1/verifiedboot_relkeys.der.x509" ]] && [[ -d "$DOS_BUILD_BASE/$2" ]]; then + if cp "$DOS_SIGNING_KEYS/$1/verifiedboot_relkeys.der.x509" "$DOS_BUILD_BASE/$2/verifiedboot_$1_dos_relkeys.der.x509"; then + echo -e "\e[0;32mCopied verifiedboot keys for $1 to $2\e[0m"; + else + echo -e "\e[0;31mCould not copy verifiedboot keys for $1\e[0m"; + fi; fi; - else - echo -e "\e[0;33mCould not copy verifiedboot keys for $1\e[0m"; - fi; - if [[ -f "$DOS_SIGNING_KEYS/$1/verity.x509.pem" ]] && [[ -d "$DOS_BUILD_BASE/$2/certs" ]]; then - if cat "$DOS_SIGNING_KEYS/$1/verity.x509.pem" >> "$DOS_BUILD_BASE/$2/certs/verity.x509.pem"; then - echo -e "\e[0;32mAppended verity keys for $1 to $2\e[0m"; - else - echo -e "\e[0;33mCould not append verity keys for $1\e[0m"; + if [[ -f "$DOS_SIGNING_KEYS/$1/verity.x509.pem" ]] && [[ -d "$DOS_BUILD_BASE/$2/certs" ]]; then + if cat "$DOS_SIGNING_KEYS/$1/verity.x509.pem" >> "$DOS_BUILD_BASE/$2/certs/verity.x509.pem"; then + echo -e "\e[0;32mAppended verity keys for $1 to $2\e[0m"; + else + echo -e "\e[0;31mCould not append verity keys for $1\e[0m"; + fi; fi; - else - echo -e "\e[0;33mCould not append verity keys for $1\e[0m"; + elif [[ ! -d "$DOS_SIGNING_KEYS/$1" ]] && [[ -d "$DOS_BUILD_BASE/$2" ]]; then + echo -e "\e[0;31mNo keys available for $1 but kernel $2 exists!\e[0m"; fi; } diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index b897d829..a22246d9 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -41,8 +41,12 @@ export -f buildDevice; buildDeviceUserDebug() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-userdebug" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-userdebug" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDeviceUserDebug; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 01671c6f..4179e2f5 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 59c30788..fd7e6f50 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 9f0a7ebc..9a69cede 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 645f9e97..2c5dc518 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index fbfac231..341c42f3 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 08ee4621..9f83efca 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -32,8 +32,12 @@ export -f scanWorkspaceForMalware; buildDevice() { cd "$DOS_BUILD_BASE"; - #export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; - breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then + #export OTA_KEY_OVERRIDE_DIR="$DOS_SIGNING_KEYS/$1"; + breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2; + else + echo -e "\e[0;31mNo signing keys available for $1\e[0m"; + fi; } export -f buildDevice; diff --git a/Scripts/init.sh b/Scripts/init.sh index 98fc7d59..74552274 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -187,3 +187,6 @@ source "$DOS_SCRIPTS_COMMON/Shell.sh"; source "$DOS_SCRIPTS_COMMON/Functions.sh"; source "$DOS_SCRIPTS_COMMON/Tag_Verifier.sh"; source "$DOS_SCRIPTS/Functions.sh"; + +[[ -f "$DOS_BUILD_BASE/.repo/local_manifests/roomservice.xml" ]] && echo "roomservice manifest found! Please fix your manifests before continuing!"; +[[ -f "$DOS_BUILD_BASE/DOS_PATCHED_FLAG" ]] && echo "NOTE: THIS WORKSPACE IS ALREADY PATCHED, PLEASE RESET BEFORE PATCHING AGAIN!";