diff --git a/pixel/all.sh b/pixel/all.sh index c44ae04..ae3e911 100755 --- a/pixel/all.sh +++ b/pixel/all.sh @@ -21,8 +21,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}/../vars" +readonly top="${script_path}/../../.." readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/device.sh b/pixel/device.sh index 25bc747..0473dec 100755 --- a/pixel/device.sh +++ b/pixel/device.sh @@ -21,8 +21,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}/../vars" +readonly top="${script_path}/../../.." readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/download.sh b/pixel/download.sh index 80900a7..15de9c3 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}/../vars" readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/extract-factory-image.sh b/pixel/extract-factory-image.sh index fb61e93..b839a3b 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}/../vars" readonly work_dir="${WORK_DIR:-/tmp/pixel}" diff --git a/pixel/firmware.sh b/pixel/firmware.sh index e7c98bc..60c00bb 100755 --- a/pixel/firmware.sh +++ b/pixel/firmware.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}/../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 a3f978c..4fa56d6 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}/../vars" readonly tmp_dir="${TMPDIR:-/tmp}/pixel"