Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gnome App dbus fixes (for tag as 0.0.2) #4

Merged
merged 8 commits into from
Jul 20, 2021
Merged

Gnome App dbus fixes (for tag as 0.0.2) #4

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c6cd3db
use allexport, and only source files, not directories
satmandu Jul 14, 2021
843ffc7
Set LANG to en_US.UTF-8 if not set
satmandu Jul 14, 2021
f4b57d3
Make sure that CREW_PREFIX gets set.
satmandu Jul 14, 2021
f49c79c
Add dbus settings required for gnome apps
satmandu Jul 14, 2021
b2a521a
Adjust DBUS_SYSTEM_BUS_ADDRESS to work with vmc
satmandu Jul 14, 2021
884355c
Add GCONV variable, which requires CREW_LIB_PREFIX
satmandu Jul 15, 2021
51c43f9
Add CREW_LIB_SUFFIX (used for env.d/04-iconv) and change '! -z' to '-n'
satmandu Jul 15, 2021
78fbf86
style
satmandu Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add CREW_LIB_SUFFIX (used for env.d/04-iconv) and change '! -z' to '-n'
  • Loading branch information
@satmandu
satmandu authored Jul 15, 2021
commit 51c43f94f8611d50afe398c1f053cf9453d0d7cf
20 changes: 18 additions & 2 deletions src/profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
# Source the base /etc/profile file
source /etc/profile

ARCH="$(uname -m)"
# For container usage, where we are emulating armv7l via linux32
ARCH="${ARCH/armv8l/armv7l}"
case "${ARCH}" in
"i686"|"armv7l"|"aarch64")
LIB_SUFFIX=''
;;
'x86_64')
LIB_SUFFIX='64'
;;
*)
;;
esac

# Export variables set (set allexport)
set -a

Expand All @@ -16,6 +30,8 @@ CREW_PREFIX="$(crew const CREW_PREFIX | sed -e 's:CREW_PREFIX=::g')"
# get breakage from files in /etc/env.d being sourced.
: "${CREW_PREFIX:=/usr/local}"

: "${CREW_LIB_PREFIX:=/usr/local/lib$LIB_SUFFIX}"

# Find system configuration directory
CREW_SYSCONFDIR="${CREW_PREFIX}/etc"

Expand All @@ -31,12 +47,12 @@ if [ -d ${CREW_SYSCONFDIR}/profile.d ]; then
fi

# Load the bash directory
if [ ! -z "${BASH}" ]; then
if [ -n "${BASH}" ]; then
for i in "${CREW_SYSCONFDIR}"/bash.d/*; do [[ -f $i ]] && source "${i}"; done
fi

# Load the zsh directory
if [ ! -z "${ZSH_NAME}" ]; then
if [ -n "${ZSH_NAME}" ]; then
for i in "${CREW_SYSCONFDIR}"/zsh.d/*; do [[ -f $i ]] && source "${i}"; done
fi

Expand Down