diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f46049..74aa967 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,19 +26,19 @@ install_build_script(multilib-archlinuxcn-build) foreach(CARCH arm armv6h armv7h aarch64) install_build_script("archlinuxcn-${CARCH}-build") - configure_file(pacman-archlinuxcn-arm.conf.in - "pacman-archlinuxcn-${CARCH}.conf" @ONLY) + configure_file(archlinuxcn-arm.conf.in + "archlinuxcn-${CARCH}.conf" @ONLY) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/pacman-archlinuxcn-${CARCH}.conf" - DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/") + "${CMAKE_CURRENT_BINARY_DIR}/archlinuxcn-${CARCH}.conf" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/pacman.conf.d") endforeach() install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/cmds/" DESTINATION "${CMAKE_INSTALL_BINDIR}") install(FILES - "pacman-archlinuxcn.conf" - "pacman-archlinuxcn-testing.conf" - "pacman-archlinuxcn-staging.conf" - "pacman-archlinuxcn-kde-unstable.conf" - "pacman-multilib-archlinuxcn.conf" - DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/") + "archlinuxcn.conf" + "archlinuxcn-testing.conf" + "archlinuxcn-staging.conf" + "archlinuxcn-kde-unstable.conf" + "multilib-archlinuxcn.conf" + DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/devtools/pacman.conf.d/") diff --git a/pacman-archlinuxcn-arm.conf.in b/archlinuxcn-arm.conf.in similarity index 100% rename from pacman-archlinuxcn-arm.conf.in rename to archlinuxcn-arm.conf.in diff --git a/pacman-archlinuxcn-testing.conf b/archlinuxcn-kde-unstable.conf similarity index 94% rename from pacman-archlinuxcn-testing.conf rename to archlinuxcn-kde-unstable.conf index 2c714c8..f81679d 100644 --- a/pacman-archlinuxcn-testing.conf +++ b/archlinuxcn-kde-unstable.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -32,10 +31,11 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload +NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace -#VerbosePkgLists +VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -73,21 +73,21 @@ Server = http://repo.archlinuxcn.org/$arch # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[testing] +[kde-unstable] +Include = /etc/pacman.d/mirrorlist + +[core-testing] Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist +[extra-testing] +Include = /etc/pacman.d/mirrorlist + [extra] Include = /etc/pacman.d/mirrorlist -[community-testing] -Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/pacman-archlinuxcn-kde-unstable.conf b/archlinuxcn-staging.conf similarity index 94% rename from pacman-archlinuxcn-kde-unstable.conf rename to archlinuxcn-staging.conf index 1650187..0e89323 100644 --- a/pacman-archlinuxcn-kde-unstable.conf +++ b/archlinuxcn-staging.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -32,10 +31,11 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload +NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace -#VerbosePkgLists +VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -73,24 +73,24 @@ Server = http://repo.archlinuxcn.org/$arch # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[kde-unstable] +[core-staging] Include = /etc/pacman.d/mirrorlist -[testing] +[core-testing] Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist +[extra-staging] +Include = /etc/pacman.d/mirrorlist + +[extra-testing] +Include = /etc/pacman.d/mirrorlist + [extra] Include = /etc/pacman.d/mirrorlist -[community-testing] -Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/pacman-archlinuxcn-staging.conf b/archlinuxcn-testing.conf similarity index 90% rename from pacman-archlinuxcn-staging.conf rename to archlinuxcn-testing.conf index d966cf5..696644a 100644 --- a/pacman-archlinuxcn-staging.conf +++ b/archlinuxcn-testing.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -32,10 +31,11 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload +NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace -#VerbosePkgLists +VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -73,27 +73,18 @@ Server = http://repo.archlinuxcn.org/$arch # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -[staging] -Include = /etc/pacman.d/mirrorlist - -[testing] +[core-testing] Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist +[extra-testing] +Include = /etc/pacman.d/mirrorlist + [extra] Include = /etc/pacman.d/mirrorlist -[community-staging] -Include = /etc/pacman.d/mirrorlist - -[community-testing] -Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/pacman-archlinuxcn.conf b/archlinuxcn.conf similarity index 93% rename from pacman-archlinuxcn.conf rename to archlinuxcn.conf index 33de0b9..b974d72 100644 --- a/pacman-archlinuxcn.conf +++ b/archlinuxcn.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -32,10 +31,11 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload +NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace -#VerbosePkgLists +VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -73,19 +73,16 @@ Server = http://repo.archlinuxcn.org/$arch # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for diff --git a/pacman-multilib-archlinuxcn.conf b/multilib-archlinuxcn.conf similarity index 94% rename from pacman-multilib-archlinuxcn.conf rename to multilib-archlinuxcn.conf index a9de99e..6f2c025 100644 --- a/pacman-multilib-archlinuxcn.conf +++ b/multilib-archlinuxcn.conf @@ -16,10 +16,9 @@ #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled -#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -32,10 +31,11 @@ Architecture = auto # Misc options #UseSyslog #Color -#TotalDownload +NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace -#VerbosePkgLists +VerbosePkgLists +ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -73,19 +73,16 @@ Server = http://repo.archlinuxcn.org/$arch # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system,