From 142336730cf06c8efed4f8319e0b37971dc207c4 Mon Sep 17 00:00:00 2001 From: Pavel Kirilin <win10@list.ru> Date: Tue, 4 Aug 2020 12:42:24 +0400 Subject: [PATCH] Fixed update script. Signed-off-by: Pavel Kirilin <win10@list.ru> --- update_desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_desktop.sh b/update_desktop.sh index 3b620c6..f5061f7 100644 --- a/update_desktop.sh +++ b/update_desktop.sh @@ -12,7 +12,7 @@ function full_update(){ git checkout -b "$apply_branch" apply_conf="$(mktemp /tmp/custom_patchXXXXX)" echo "# You can edit this file to manipulate ordering and patches to apply" > "$apply_conf" - git branch -a | grep -Ev 'master|remotes' | grep 'patch/' | cut -c 3- >> "$apply_conf" + git branch -a | grep -Ev '^master$|remotes' | grep 'patch/' | cut -c 3- >> "$apply_conf" echo "$EDITOR" if [ -z ${EDITOR+x} ];then echo -e "${RED}\$EDITOR env is not found${NC}.\nTry this before running script: 'export EDITOR=/bin/vim'" -- GitLab