BitMaster/mybash
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/mybash.git synced 2026-04-07 04:58:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update setup.sh to correctly detect home directory

Browse Source 
Previously the script sometimes incorrectly used /root as the home directory.
This commit is contained in:
Jonwin
2023-08-28 17:23:17 +02:00
committed by GitHub
parent ee6d07ead9
commit dc3a5b6b5b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setup.sh
View File

@@ -87,11 +87,13 @@ installStarship(){
}
linkConfig() {
## Get the correct user home directory.
USER_HOME=$(getent passwd ${SUDO_USER:-$USER} | cut -d: -f6)
## Check if a bashrc file is already there.
OLD_BASHRC="${HOME}/.bashrc"
OLD_BASHRC="${USER_HOME}/.bashrc"
if [[ -e ${OLD_BASHRC} ]]; then
echo -e "${YELLOW}Moving old bash config file to ${HOME}/.bashrc.bak${RC}"
if ! mv ${OLD_BASHRC} ${HOME}/.bashrc.bak; then
echo -e "${YELLOW}Moving old bash config file to ${USER_HOME}/.bashrc.bak${RC}"
if ! mv ${OLD_BASHRC} ${USER_HOME}/.bashrc.bak; then
echo -e "${RED}Can't move the old bash config file!${RC}"
exit 1
fi
@@ -99,8 +101,8 @@ linkConfig() {
echo -e "${YELLOW}Linking new bash config file...${RC}"
## Make symbolic link.
ln -svf ${GITPATH}/.bashrc ${HOME}/.bashrc
ln -svf ${GITPATH}/starship.toml ${HOME}/.config/starship.toml
ln -svf ${GITPATH}/.bashrc ${USER_HOME}/.bashrc
ln -svf ${GITPATH}/starship.toml ${USER_HOME}/.config/starship.toml
}
checkEnv