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

Jump to bottom

Merge Linux and Mac Install Script + Fixes + Messages #64

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Merge Linux and Mac Install Script + Fixes + Messages #64

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca08ca
updated linux install script to fix readme and folder not existing
abeljim Nov 11, 2023
dc71580
merged install into a single script and added messges
abeljim Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
merged install into a single script and added messges
  • Loading branch information
@abeljim
abeljim committed Nov 11, 2023
commit dc715805049ae0ccfd8362c9e2e5b345e7272626
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ There is also a script that automates the deletion of all Monaspace fonts from `

```bash
$ cd util
$ bash ./install_macos.sh
$ bash ./install.sh
```
You can also use [homebrew](https://brew.sh/) as an alternative:

Expand All @@ -68,7 +68,7 @@ There is also a script which automates the deletion of all Monaspace fonts from

```bash
$ cd util
$ bash ./install_linux.sh
$ bash ./install.sh
```

### Webfonts
Expand Down
66 changes: 66 additions & 0 deletions util/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
#!/bin/bash

echo "Starting font installation process..."

# Get target root directory
if [[ $(uname) == 'Darwin' ]]; then
# MacOS
sys_share_dir="/Library"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is never used.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the code comes from my snippet.

That variable would be used if the script allows system-wide installation.
As it does not (yet) you are right it's unused/

usr_share_dir="$HOME/Library"
font_subdir="Fonts"
echo "Detected MacOS. Setting directories accordingly."
else
# Linux
sys_share_dir="/usr/local/share"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

usr_share_dir="$HOME/.local/share"
font_subdir="fonts"
echo "Detected Linux. Setting directories accordingly."
fi
if [ -n "${XDG_DATA_HOME}" ]; then
usr_share_dir="${XDG_DATA_HOME}"
echo "Using XDG_DATA_HOME as the user share directory."
fi

# Function to delete and copy fonts for macOS
install_fonts_mac() {
echo "Removing existing Monaspace fonts from ${usr_share_dir}/${font_subdir}..."
rm -rf ${usr_share_dir}/${font_subdir}/Monaspace*

echo "Copying new fonts to ${usr_share_dir}/${font_subdir}..."
cp ../fonts/otf/* ${usr_share_dir}/${font_subdir}
cp ../fonts/variable/* ${usr_share_dir}/${font_subdir}

echo "Fonts successfully installed for MacOS."
}

# Function to delete and copy fonts for Linux
install_fonts_linux() {
echo "Ensuring font directory exists at ${usr_share_dir}/${font_subdir}..."
mkdir -p ${usr_share_dir}/${font_subdir}

echo "Removing existing Monaspace fonts from ${usr_share_dir}/${font_subdir}..."
rm -rf ${usr_share_dir}/${font_subdir}/Monaspace*

echo "Copying new fonts..."
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
cp $SCRIPT_DIR/../fonts/otf/* ${usr_share_dir}/${font_subdir}
cp $SCRIPT_DIR/../fonts/variable/* ${usr_share_dir}/${font_subdir}

echo "Rebuilding font information caches..."
fc-cache -f

echo "Fonts successfully installed for Linux."
}

# Detect the operating system and install fonts
OS="$(uname)"
if [ "$OS" == "Darwin" ]; then
install_fonts_mac
elif [ "$OS" == "Linux" ]; then
install_fonts_linux
else
echo "Unsupported operating system: $OS"
exit 1
fi

echo "Font installation process completed."
16 changes: 0 additions & 16 deletions util/install_linux.sh
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions util/install_macos.sh
View file
Open in desktop

This file was deleted.