Compare commits

...

2 Commits

Author SHA1 Message Date
d1b2da317f comparepkg: fix color for moves 2020-06-14 13:38:07 +02:00
e59680bf11 commitpkg: simplify and cover all cases 2020-06-14 09:48:24 +02:00
2 changed files with 6 additions and 15 deletions

View File

@@ -22,20 +22,11 @@ prepare_commit(){
msg "Switching to new layout ..."
[[ ! -d "$CARCH" ]] && mkdir "$CARCH"
if [[ -d repos/"${REPO_SRC}-$CARCH" ]] || [[ -d repos/"${REPO_SRC}"-any ]]; then
mkdir "$CARCH/${REPO_SRC}"
local old_src="${REPO_SRC}-$CARCH"
[[ "$arch" == any ]] && old_src="${REPO_SRC}"-any
cp repos/"$old_src"/* "$CARCH/${REPO_SRC}"/
git add $CARCH/${REPO_SRC}
fi
if [[ -d repos/"${REPO_DEST}-$CARCH" ]] || [[ -d repos/"${REPO_DEST}"-any ]]; then
mkdir "$CARCH/${REPO_DEST}"
local old_dest="${REPO_DEST}-$CARCH"
[[ "$arch" == any ]] && old_dest="${REPO_DEST}"-any
cp repos/"$old_dest"/* "$CARCH/${REPO_DEST}"/
git add $CARCH/${REPO_DEST}
fi
for r in $(ls repos); do
mkdir "$CARCH/${r%-*}"
cp repos/${r}/* $CARCH/${r%-*}/
git add $CARCH/${r%-*}
done
git rm -r repos
git commit -m "switch to new repo layout"

View File

@@ -28,7 +28,7 @@ get_import_path(){
compare_m(){
local result=$(vercmp "$artixver" "$archver")
if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
if [[ "$archrepo" == "$artixrepo" ]]; then
if [[ "${a}" == "${b}" ]]; then
msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
else
msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"