Compare commits

...

6 Commits

4 changed files with 9 additions and 6 deletions

View File

@@ -33,7 +33,7 @@ artixpkg_git_create() {
local pkgbase local pkgbase
local clone=0 local clone=0
local config=0 local config=0
local TEAM='extra' local TEAM='world'
# variables # variables
local path local path

View File

@@ -69,6 +69,7 @@ artixpkg_repo_add() {
done done
DEST="$1" DEST="$1"
shift
pkgbases+=("$@") pkgbases+=("$@")
if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then

View File

@@ -21,11 +21,11 @@ patch_pkgbase(){
-e '/nscd.service/d' \ -e '/nscd.service/d' \
-i "${pkgbuild}" -i "${pkgbuild}"
;; ;;
linux|linux-lts) linux|linux-lts|linux-zen|linux-hardened|linux-rt|linux-rt-lts)
msg "Patching %s" "${name}" msg "Patching %s" "${name}"
sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "${pkgbuild}" sed -e 's|KBUILD_BUILD_HOST=.*|KBUILD_BUILD_HOST=artixlinux|' -i "${pkgbuild}"
sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \ sed -e 's|CONFIG_DEFAULT_HOSTNAME=.*|CONFIG_DEFAULT_HOSTNAME="artixlinux"|' \
-i "$pkgpath"/config -i trunk/config
;; ;;
gstreamer|gst-plugins-*|licenses) gstreamer|gst-plugins-*|licenses)
msg "Patching %s" "${name}" msg "Patching %s" "${name}"
@@ -104,7 +104,7 @@ artixpkg_repo_import() {
stat_done stat_done
stat_busy "Fetching upstream tags" stat_busy "Fetching upstream tags"
git fetch upstream --tags git fetch --tags upstream main
stat_done stat_done
local latest version local latest version

View File

@@ -64,13 +64,14 @@ artixpkg_repo_remove() {
die "invalid argument: %s" "$1" die "invalid argument: %s" "$1"
;; ;;
*) *)
pkgbases=("$@")
break break
;; ;;
esac esac
done done
DEST="$1" DEST="$1"
shift
pkgbases=("$@")
if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then if ! in_array "${DEST}" "${ARTIX_DB[@]}"; then
die "${DEST} does not exist!" die "${DEST} does not exist!"
@@ -122,7 +123,8 @@ artixpkg_repo_remove() {
if (( SET_TOPIC )); then if (( SET_TOPIC )); then
# topics meta # topics meta
if [[ -n ${GIT_TOKEN} ]]; then if [[ -n ${GIT_TOKEN} ]]; then
local topic="${SRC}" local topic="${DEST}"
local gitname=$(get_compliant_name "${pkgbase}")
if ! remove_topic "${gitname}" "${topic}" >/dev/null; then if ! remove_topic "${gitname}" "${topic}" >/dev/null; then
warning "failed to remove pacman repo topic: ${topic}" warning "failed to remove pacman repo topic: ${topic}"
fi fi