mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-27 11:59:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(install): remove sudo requirement

Browse source
This commit is contained in:
Jacopo Zecchi 2024-06-13 19:11:25 +02:00 committed by GitHub
parent 821e45e968
commit 10af9c6469
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
website/static/install.sh
View file

@ -22,7 +22,7 @@ help() {
echo "Install script for Oh My Posh" echo "Install script for Oh My Posh"
echo echo
echo "Syntax: install.sh [-h|d|t]" echo "Syntax: install.sh [-h|d|t]"
echo "\noptions:" echo "options:"
echo "-h Print this help." echo "-h Print this help."
echo "-d Specify the installation directory. Defaults to /usr/local/bin or the directory where oh-my-posh is installed." echo "-d Specify the installation directory. Defaults to /usr/local/bin or the directory where oh-my-posh is installed."
echo "-t Specify the themes installation directory. Defaults to the oh-my-posh cache directory." echo "-t Specify the themes installation directory. Defaults to the oh-my-posh cache directory."
@ -80,17 +80,14 @@ set_install_directory() {
} }
validate_install_directory() { validate_install_directory() {
#check if installation dir exists
if [ ! -d "$install_dir" ]; then if [ ! -d "$install_dir" ]; then
error "Directory ${install_dir} does not exist, set a different directory and try again." error "Directory ${install_dir} does not exist, set a different directory and try again."
fi fi
# Check if sudo has write permission
if ! sudo test -w "$install_dir"; then
error "Cannot write to ${install_dir}. Please set a different directory and try again: \n curl -s https://ohmyposh.dev/install.sh | bash -s -- -d {directory}"
# Check if regular user has write permission # Check if regular user has write permission
elif [ ! -w "$install_dir" ]; then if [ ! -w "$install_dir" ]; then
error "Cannot write to ${install_dir}. Please set a different directory and try again: \n curl -s https://ohmyposh.dev/install.sh | bash -s -- -d {directory} OR use sudo" error "Cannot write to ${install_dir}. Please check write permissions or set a different directory and try again: \ncurl -s https://ohmyposh.dev/install.sh | bash -s -- -d {directory}"
fi fi
# check if the directory is in the PATH # check if the directory is in the PATH
@ -110,32 +107,15 @@ validate_install_directory() {
} }
validate_themes_directory() { validate_themes_directory() {
if [ ! -d "$install_dir" ]; then
error "Directory ${install_dir} does not exist, set a different directory and try again." # Validate if the themes directory exists
if ! mkdir -p "$themes_dir" > /dev/null 2>&1; then
error "Cannot write to ${themes_dir}. Please check write permissions or set a different directory and try again: \ncurl -s https://ohmyposh.dev/install.sh | bash -s -- -t {directory}"
fi fi
# Check if sudo has write permission #check user write permission
if ! sudo test -w "$install_dir"; then if [ ! -w "$themes_dir" ]; then
error "Cannot write to ${install_dir}. Please set a different directory and try again: \n curl -s https://ohmyposh.dev/install.sh | bash -s -- -d {directory}" error "Cannot write to ${themes_dir}. Please check write permissions or set a different directory and try again: \ncurl -s https://ohmyposh.dev/install.sh | bash -s -- -t {directory}"
# Check if regular user has write permission
elif [ ! -w "$install_dir" ]; then
error "Cannot write to ${install_dir}. Please set a different directory and try again: \n curl -s https://ohmyposh.dev/install.sh | bash -s -- -d {directory} OR use sudo"
fi
# check if the directory is in the PATH
good=$(
IFS=:
for path in $PATH; do
if [ "${path%/}" = "${install_dir}" ]; then
printf 1
break
fi
done
)
if [ "${good}" != "1" ]; then
warn "Installation directory ${install_dir} is not in your \$PATH"
fi fi
} }
@ -152,10 +132,7 @@ install_themes() {
themes_dir="${cache_dir}/themes" themes_dir="${cache_dir}/themes"
fi fi
# Validate if the themes directory exists validate_themes_directory
if [ ! -d "$themes_dir" ]; then
mkdir -p $themes_dir
fi
info "🎨 Installing oh-my-posh themes in ${themes_dir}\n" info "🎨 Installing oh-my-posh themes in ${themes_dir}\n"
@ -214,8 +191,8 @@ install() {
info "🚀 Installation complete.\n\nYou can follow the instructions at https://ohmyposh.dev/docs/installation/prompt" info "🚀 Installation complete.\n\nYou can follow the instructions at https://ohmyposh.dev/docs/installation/prompt"
info "to setup your shell to use oh-my-posh." info "to setup your shell to use oh-my-posh."
if [ $http_response = "200" ]; then if [ $http_response = "200" ]; then
info "\nIf you want to use a built-in theme, you can find them in the ${theme_dir} directory:" info "\nIf you want to use a built-in theme, you can find them in the ${themes_dir} directory:"
info " oh-my-posh init {shell} --config ${theme_dir}/{theme}.omp.json\n" info " oh-my-posh init {shell} --config ${themes_dir}/{theme}.omp.json\n"
fi fi
} }