diff --git a/pixel/all.sh b/pixel/all.sh index ae3e911..de8e155 100755 --- a/pixel/all.sh +++ b/pixel/all.sh @@ -21,7 +21,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly top="${script_path}/../../.." readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/build-desc-fingerprint.sh b/pixel/build-desc-fingerprint.sh index 89d9433..fbf7156 100755 --- a/pixel/build-desc-fingerprint.sh +++ b/pixel/build-desc-fingerprint.sh @@ -22,8 +22,8 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars/" -readonly top="${script_path}/../../../" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" +readonly top="${script_path}/../../.." readonly tmp_dir="${TMPDIR:-/tmp}/pixel" @@ -61,7 +61,7 @@ main() { ( local dv="${vars_path}/${d}" source "${dv}" - local mk="$(ls ${top}/device/google/*/calyx_${d}.mk)" + local mk="$(ls ${top}/device/google/*/lineage_${d}.mk)" sed -i "s/${prev_build_id}/${build_id}/g" "${mk}" sed -i "s/${prev_build_number}/${build_number}/g" "${mk}" ) diff --git a/pixel/device.sh b/pixel/device.sh index 0473dec..efbe624 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -21,7 +21,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly top="${script_path}/../../.." readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/download.sh b/pixel/download.sh index 15de9c3..f91f456 100755 --- a/pixel/download.sh +++ b/pixel/download.sh @@ -22,7 +22,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/extract-factory-image.sh b/pixel/extract-factory-image.sh index b839a3b..5b3eb4e 100755 --- a/pixel/extract-factory-image.sh +++ b/pixel/extract-factory-image.sh @@ -22,7 +22,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/firmware.sh b/pixel/firmware.sh index c7505a2..a69ef45 100755 --- a/pixel/firmware.sh +++ b/pixel/firmware.sh @@ -22,7 +22,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly top="${script_path}/../../.." readonly extract_ota_py="${top}/tools/extract-utils/extract_ota.py" diff --git a/pixel/update-device-vars.sh b/pixel/update-device-vars.sh index acdce0a..26d88e3 100755 --- a/pixel/update-device-vars.sh +++ b/pixel/update-device-vars.sh @@ -22,7 +22,7 @@ trap 'error_m interrupted!' SIGINT ### CONSTANTS ### readonly script_path="$(cd "$(dirname "$0")";pwd -P)" -readonly vars_path="${script_path}/../vars" +readonly vars_path="${script_path}/../../../vendor/lineage/vars" readonly tmp_dir="${TMPDIR:-/tmp}/pixel"