From 1bd25d491e3c6a89560588ec8f7aec46f76e1e9c Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 10 Jan 2018 14:50:54 +0100 Subject: introduce our modification repository (not yet functional) --- asp32.in | 14 +++++++++++--- man/asp32.1.txt | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/asp32.in b/asp32.in index ef60587..c5f5417 100644 --- a/asp32.in +++ b/asp32.in @@ -1,7 +1,7 @@ #!/bin/bash ASP_VERSION=@ASP_VERSION@ -ARCH_GIT_REPOS=(packages community) +ARCH_GIT_REPOS=(packages64 community64 packages32) OPT_ARCH=$(uname -m) OPT_FORCE=0 @@ -132,7 +132,11 @@ initialize() { if [[ ! -f $ASPROOT/.asp ]]; then git init -q "$ASPROOT" || return 1 for remote in "${ARCH_GIT_REPOS[@]}"; do - git remote add "$remote" "https://git.archlinux.org/svntogit/$remote.git" || return 1 + if [[ "${remote}" = *64 ]]; then + git remote add "$remote" "https://git.archlinux.org/svntogit/${remote%64}.git" || return 1 + elif [[ "${remote}" = *32 ]]; then + git remote add "$remote" "https://git.archlinux32.org/archlinux32/${remote%32}.git" || return 1 + fi done touch "$ASPROOT/.asp" || return 1 @@ -300,7 +304,11 @@ action__set-git-protocol() { esac for remote in "${ARCH_GIT_REPOS[@]}"; do - git remote set-url "$remote" "$1://git.archlinux.org/svntogit/$remote.git" + if [[ "${remote}" = *64 ]]; then + git remote set-url "$remote" "$1://git.archlinux.org/svntogit/${remote%64}.git" + elif [[ "${remote}" = *32 ]]; then + git remote set-url "$remote" "$1://git.archlinux32.org/archlinux32/${remote%32}.git" + fi done } diff --git a/man/asp32.1.txt b/man/asp32.1.txt index be089d4..50ef80c 100644 --- a/man/asp32.1.txt +++ b/man/asp32.1.txt @@ -20,7 +20,7 @@ This is a fork for the specific needs of the Archlinux32 project Manage the version-controlled sources for the build scripts used to create Arch Linux 32 packages. This program provides a thin wrapper over the svntogit -repositories hosted at https://git.archlinux.org and https://github.com/archlinux32/packages. +repositories hosted at https://git.archlinux.org and https://git.archlinux32.org/archlinux32/packages. It aims to provide a replacement for abs which favors a sparse checkout. Commands -- cgit v1.2.3-54-g00ecf