Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
d1b2da317f | |||
e59680bf11 |
@@ -22,20 +22,11 @@ prepare_commit(){
|
|||||||
msg "Switching to new layout ..."
|
msg "Switching to new layout ..."
|
||||||
[[ ! -d "$CARCH" ]] && mkdir "$CARCH"
|
[[ ! -d "$CARCH" ]] && mkdir "$CARCH"
|
||||||
|
|
||||||
if [[ -d repos/"${REPO_SRC}-$CARCH" ]] || [[ -d repos/"${REPO_SRC}"-any ]]; then
|
for r in $(ls repos); do
|
||||||
mkdir "$CARCH/${REPO_SRC}"
|
mkdir "$CARCH/${r%-*}"
|
||||||
local old_src="${REPO_SRC}-$CARCH"
|
cp repos/${r}/* $CARCH/${r%-*}/
|
||||||
[[ "$arch" == any ]] && old_src="${REPO_SRC}"-any
|
git add $CARCH/${r%-*}
|
||||||
cp repos/"$old_src"/* "$CARCH/${REPO_SRC}"/
|
done
|
||||||
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
|
|
||||||
|
|
||||||
git rm -r repos
|
git rm -r repos
|
||||||
git commit -m "switch to new repo layout"
|
git commit -m "switch to new repo layout"
|
||||||
|
@@ -28,7 +28,7 @@ get_import_path(){
|
|||||||
compare_m(){
|
compare_m(){
|
||||||
local result=$(vercmp "$artixver" "$archver")
|
local result=$(vercmp "$artixver" "$archver")
|
||||||
if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
|
if [[ $artixrepo == *testing* ]] || [[ $artixrepo == *staging* ]]; then
|
||||||
if [[ "$archrepo" == "$artixrepo" ]]; then
|
if [[ "${a}" == "${b}" ]]; then
|
||||||
msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
|
msg_row "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
|
||||||
else
|
else
|
||||||
msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
|
msg_row_notify "${table}" "${a}" "${b}" "$pkg" "$archver" "$artixver" "${group#*-}"
|
||||||
|
Reference in New Issue
Block a user