diff --git a/build-pkg.sh b/build-pkg.sh index f2a4bac..8704cc2 100755 --- a/build-pkg.sh +++ b/build-pkg.sh @@ -10,7 +10,7 @@ function build-with-makepkg() { case "$?" in 0) # Copy the build package to /home/custompkgs - cp "${PKG}-"*.pkg.tar.zst /home/custompkgs/ || return $? + cp --no-clobber "${PKG}-"*.pkg.tar.zst /home/custompkgs/ || return $? ;; 13) # Exit code 13: A package has already been built. @@ -38,8 +38,8 @@ function build-pkg() { cd "pkg/${PKG}" || return $? # Build and copy to /home/custompkgs - # build-with-makepkg || { - build-with-aurutils || { + build-with-makepkg || { +# build-with-aurutils || { echo "Failed to build package ${PKG}!"; FAILED_PKGS+=("${PKG}"); } diff --git a/pkg/de-p1st-locale/PKGBUILD b/pkg/de-p1st-locale/PKGBUILD index 56cf52f..2fcdd23 100644 --- a/pkg/de-p1st-locale/PKGBUILD +++ b/pkg/de-p1st-locale/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=locale _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.1 +pkgver=0.0.2 pkgrel=1 pkgdesc="locale and timezone" arch=('any') @@ -26,8 +26,8 @@ sha256sums=('SKIP') package() { cd "${_reponame}/pkg/${pkgname}" - install -Dm0644 locale.conf "$pkgdir"/etc/locale.conf - install -Dm0544 locale.gen.holoscript "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.gen.holoscript + install -Dm0644 locale.conf "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.conf + install -Dm0644 locale.gen "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/locale.gen - ln -sf /usr/share/zoneinfo/Europe/Berlin "$pkgdir"/etc/localtime + install -Dm0644 localtime "$pkgdir"/usr/share/holo/files/"$pkgname"/etc/localtime } diff --git a/pkg/de-p1st-locale/locale.gen b/pkg/de-p1st-locale/locale.gen new file mode 100644 index 0000000..2df0483 --- /dev/null +++ b/pkg/de-p1st-locale/locale.gen @@ -0,0 +1,5 @@ +de_DE.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +en_US.UTF-8 UTF-8 +# en_US ISO-8859-1 diff --git a/pkg/de-p1st-locale/locale.gen.holoscript b/pkg/de-p1st-locale/locale.gen.holoscript deleted file mode 100644 index 71973cf..0000000 --- a/pkg/de-p1st-locale/locale.gen.holoscript +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# stdin: default config -# stdout: modified config - -echo 'de_DE.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -en_US.UTF-8 UTF-8 -# en_US ISO-8859-1' diff --git a/pkg/de-p1st-locale/localtime b/pkg/de-p1st-locale/localtime new file mode 120000 index 0000000..622b45b --- /dev/null +++ b/pkg/de-p1st-locale/localtime @@ -0,0 +1 @@ +/usr/share/zoneinfo/Europe/Berlin \ No newline at end of file