X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=common.sh;h=8e9f484d13ef16939ab16216807ace2330d6c5ac;hb=HEAD;hp=5e27d5f90abeef67082e63590b3767317e71f193;hpb=c86f9a3696d40e5f8c9aba4e67b0099b408d7399;p=next-scripts diff --git a/common.sh b/common.sh index 5e27d5f..8e9f484 100644 --- a/common.sh +++ b/common.sh @@ -6,11 +6,12 @@ [ "$_next_common_included" ] && return 0 _next_common_included=1 -bin_dir=$(dirname "$0") +bin_dir=$(realpath $(dirname "$0")) +top_dir=$(dirname "$bin_dir") -[ "$LOG_FILE" ] || LOG_FILE="../merge.log" -SHA1_FILE="../SHA1s" -CTRL_FILE="../etc/control" +[ "$LOG_FILE" ] || LOG_FILE="$top_dir/merge.log" +SHA1_FILE="$top_dir/SHA1s" +CTRL_FILE="$top_dir/etc/control" build_host="ash" build_dir="/home/sfr/next/next" @@ -53,4 +54,29 @@ get_contacts() awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $1; }' $CTRL_FILE } +get_url() +{ + awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $4; }' $CTRL_FILE +} + +get_build_flag() +{ + awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $6; }' $CTRL_FILE +} + +check_unmerged_files() +{ + local tree="$1" + local um_files + local rm_files + + um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p') + if [ "$um_files" ] && [ -f "../merge-files/$tree" ]; then + rm_files=$(grep -F "$um_files" "../merge-files/$tree") + if [ "$rm_files" ]; then + "$bin_dir/do_rm" $rm_files + fi + fi +} + true