mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 22:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/alpine-baselayout: also guard bash source on not /bin/sh

Browse Source 
and clarify comments
This commit is contained in:
psykose 2023-05-04 10:03:15 +00:00
parent 622e9e1f47
commit 2020f03a8c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/alpine-baselayout/APKBUILD
View File

@ -1,7 +1,7 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=alpine-baselayout pkgname=alpine-baselayout
pkgver=3.4.2 pkgver=3.4.3
pkgrel=0 pkgrel=0
pkgdesc="Alpine base dir structure and init scripts" pkgdesc="Alpine base dir structure and init scripts"
url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout" url="https://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
@ -268,7 +268,7 @@ bfe947bdd69e7d93b32c8cb4e2cabe5717cb6c1e1f49a74015ac2cfb13e96d1f12c4be23ae93a1d6
806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group 806b8f23f823a9471846d12fa6b55690b95eedb4c613b82aefaba7ffef23f83e17552befd891a487864f72ef24e395d8611738933f684a85eb4c336cb20994f8 group
fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab fdab6f8fec2a556ab817d90a73635a927ea04dbc4e0470ed59ee6a62c87393f9534c9b746b09a776d938c25b8af9c9fb1686578e24f8307d1d074921ade1bdc7 inittab
06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd 06d12a7b9ca14fe17e412d0f24814620b67d035ae859be7906cbf4782dd69e359a6a555dafb98060b7fb7e4714aaa676c88d9017cded36e6d8398e23369bb290 passwd
46fb7b1d76f149c834e9bf6874c65186bb13e42b60a1bf5e010a7ed02e633266ee13365d2604b3c19fcd6aec7d7780a7535fb42e727af681d2073692dc91539f profile 116c007f0f0062c3cf68bc0d91a5bae2c4c48e9bdd77ab63e319f9d50db70747961124e9e4b639dbeec9a82556c170f67484f134f425194ff308377d5d3dd07c profile
3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15 protocols-6.4 3a00083bcdf5a9e884c9d07877d52311e3d99e79cbee656e236ba06e08ba0dddb7ba76494fdc9dd1a826c48e197a790a69e6bb458e9df64832d6b5e904e9fd15 protocols-6.4
47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888 services-6.4 47b0f3ee73af2d259bd206a026204be0ea25531a895a0b035a904b38fe5407bc3dd2beab7f8fcb3d760587e6159702ebdb9cbc4f508942befdf7f10c10c87888 services-6.4
" "

6
main/alpine-baselayout/profile
View File

@ -35,10 +35,12 @@ else
[ "$(id -u)" -eq 0 ] && PS1="${PS1}# " || PS1="${PS1}\$ " [ "$(id -u)" -eq 0 ] && PS1="${PS1}# " || PS1="${PS1}\$ "
fi fi
if [ -n "$BASH_VERSION" ]; then if [ -n "$BASH_VERSION" ] && [ "$BASH" != "/bin/sh" ]; then
# if we're bash, also source the bashrc # if we're bash (and not /bin/sh bash), also source the bashrc
# by default, bash sources the bashrc for non-login, # by default, bash sources the bashrc for non-login,
# and only /etc/profile on login (-l). so, make it do both on login. # and only /etc/profile on login (-l). so, make it do both on login.
# this ensures that login-shell bash (e.g. -bash or bash -l) still sources the
# system bashrc, which e.g. loads bash-completion
. /etc/bash/bashrc . /etc/bash/bashrc
fi fi