diff options
| author | PÁLI Gábor János <pali.gabor@gmail.com> | 2022-12-30 14:47:25 +0100 |
|---|---|---|
| committer | PÁLI Gábor János <pali.gabor@gmail.com> | 2022-12-30 14:47:25 +0100 |
| commit | 1c1b02874e1749d61b9b1680f744bf8470147416 (patch) | |
| tree | 90578f8f7b73792dd41129b71bc73b0eefd81d32 /aports/base-layout | |
| parent | 1b300a88b562f707ccd1b67229bd878930c9766c (diff) | |
| download | freebsd-wifibox-alpine-1c1b02874e1749d61b9b1680f744bf8470147416.zip | |
Move to Linux 5.15.85 + Alpine 3.17.0.
Diffstat (limited to 'aports/base-layout')
| -rw-r--r-- | aports/base-layout/APKBUILD | 14 | ||||
| -rw-r--r-- | aports/base-layout/profile | 22 |
2 files changed, 17 insertions, 19 deletions
diff --git a/aports/base-layout/APKBUILD b/aports/base-layout/APKBUILD index 7597bc4..9b46b78 100644 --- a/aports/base-layout/APKBUILD +++ b/aports/base-layout/APKBUILD @@ -1,16 +1,16 @@ # Maintainer: Gabor Pali <pali.gabor@gmail.com> pkgname=baselayout -pkgver=3.2.0 -pkgrel=21 # base: 23 +pkgver=3.4.0 +pkgrel=0 # base: 0 pkgdesc="Base dir structure and init scripts (Alpine Linux)" url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" -arch="all" +arch="noarch" license="GPL-2.0-only" pkggroups="shadow" options="!fhs !check" install= -_nbver=6.2 +_nbver=6.4 source="crontab locale.sh @@ -195,7 +195,7 @@ b2fc9b72846a43a45ba9a8749e581cef34d1915836833b51b7919dfbf4e275b7d55fec4dea7b23df 806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group 7cc3c23062c730ec7a1d7850423d9901047005520da5b347b7b24e5f33a9c9a9129b430557f7f41e565f143624b7f3c47e3f6e4a6a446e75f0ea245c03d70880 inittab 06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd -b14920eae431d1f15b066e264a94f804540c5dcbf91caef034019d95456c975c0c054672e53369082682dd9454a034f26bd45b312adfc0ab68a0311d97b037ac profile -eadc83e47fcc354ab83fd109bee452bda170886fb684e67faf615930c11480919505f4af60c685b124efc54af0ded9522663132f911eac6622144f8b4c8be695 protocols-6.2 -adfae0d2f569c2a2f413b7e27683a007fc8ca689b8c3349672fe0dcb6208c192ede4402eff09c604b7e7b4fd9d8df93b875efa5bdaa6c14ff1d8022a7caad5cd services-6.2 +a15252a5eb90983775f63e54d37242f4c76c5c358ad6d8c1622c7da35f1b8a722249e7375a07e9f08fbb25318bd1eb033d3927aed82c3f5e9b854ad550dad2ce profile +3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15 protocols-6.4 +47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888 services-6.4 " diff --git a/aports/base-layout/profile b/aports/base-layout/profile index fd7506b..e62587b 100644 --- a/aports/base-layout/profile +++ b/aports/base-layout/profile @@ -22,20 +22,18 @@ export PATH export PAGER=less umask 022 -# set up fallback default PS1 -: "${HOSTNAME:=$(hostname)}" -PS1='${HOSTNAME%%.*}:$PWD' -[ "$(id -u)" = "0" ] && PS1="${PS1}# " -[ "$(id -u)" = "0" ] || PS1="${PS1}\$ " - # use nicer PS1 for bash and busybox ash -[ -n "$BASH_VERSION" -o "$BB_ASH_VERSION" ] && PS1='\h:\w\$ ' - +if [ -n "$BASH_VERSION" -o "$BB_ASH_VERSION" ]; then + PS1='\h:\w\$ ' # use nicer PS1 for zsh -[ -n "$ZSH_VERSION" ] && PS1='%m:%~%# ' - -# export PS1 as before -export PS1 +elif [ -n "$ZSH_VERSION" ]; then + PS1='%m:%~%# ' +# set up fallback default PS1 +else + : "${HOSTNAME:=$(hostname)}" + PS1='${HOSTNAME%%.*}:$PWD' + [ "$(id -u)" -eq 0 ] && PS1="${PS1}# " || PS1="${PS1}\$ " +fi for script in /etc/profile.d/*.sh ; do if [ -r "$script" ] ; then |