Skip to content

Commit

Permalink
Merge upstream/main
Browse files Browse the repository at this point in the history
  • Loading branch information
adamperkowski committed Sep 18, 2024
1 parent 7ada276 commit 2ae8ad9
Show file tree
Hide file tree
Showing 47 changed files with 1,488 additions and 408 deletions.
3 changes: 0 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ Read Contributing Guidelines before opening a PR.
https://github.com/ChrisTitusTech/linutil/blob/main/.github/CONTRIBUTING.md
-->

## Title
<!--[Provide a succinct and descriptive title for the pull request.]-->

## Type of Change
- [ ] New feature
- [ ] Bug fix
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/bashisms.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Check for bashisms

on:
push:
paths:
- tabs/**
branches: [ "main" ]
pull_request:
paths:
- tabs/**
merge_group:
workflow_dispatch:

jobs:
check-bashisms:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install devscripts
run: sudo apt install devscripts

- name: Concatenate all .sh files and check for bashisms
working-directory: tabs
run: |
find . -name '*.sh' -exec checkbashisms {} + > all_scripts.sh
50 changes: 0 additions & 50 deletions .github/workflows/pr-labels.yaml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ name: Rust Checks
on:
pull_request:
branches: ["main"]
paths:
- '**/*.rs'
- 'Cargo.toml'
- 'Cargo.lock'

env:
CARGO_TERM_COLOR: always
Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e

rc='\033[0m'
red='\033[0;31m'
Expand Down
4 changes: 2 additions & 2 deletions startdev.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e

RC='\033[0m'
RED='\033[0;31m'
Expand Down Expand Up @@ -35,7 +35,7 @@ check() {
local message=$2

if [ $exit_code -ne 0 ]; then
echo -e "${RED}ERROR: $message${RC}"
printf "%b\n" "${RED}ERROR: $message${RC}"
exit 1
fi
}
Expand Down
17 changes: 9 additions & 8 deletions tabs/applications-setup/alacritty-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,34 @@

. ../common-script.sh

setupAlacritty() {
echo "Install Alacritty if not already installed..."
installAlacritty() {
printf "%b\n" "${YELLOW}Installing Alacritty...${RC}"
if ! command_exists alacritty; then
case ${PACKAGER} in
case "$PACKAGER" in
pacman)
$ESCALATION_TOOL ${PACKAGER} -S --needed --noconfirm alacritty
$ESCALATION_TOOL "$PACKAGER" -S --needed --noconfirm alacritty
;;
*)
$ESCALATION_TOOL ${PACKAGER} install -y alacritty
$ESCALATION_TOOL "$PACKAGER" install -y alacritty
;;
esac
else
echo "alacritty is already installed."
printf "%b\n" "${GREEN}Alacritty is already installed.${RC}"
fi
}

setupAlacrittyConfig() {
echo "Copy alacritty config files"
printf "%b\n" "${YELLOW}Copy alacritty config files${RC}"
if [ -d "${HOME}/.config/alacritty" ] && [ ! -d "${HOME}/.config/alacritty-bak" ]; then
cp -r "${HOME}/.config/alacritty" "${HOME}/.config/alacritty-bak"
fi
mkdir -p "${HOME}/.config/alacritty/"
curl -sSLo "${HOME}/.config/alacritty/alacritty.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/alacritty.toml"
curl -sSLo "${HOME}/.config/alacritty/nordic.toml" "https://github.com/ChrisTitusTech/dwm-titus/raw/main/config/alacritty/nordic.toml"
printf "%b\n" "${GREEN}Alacritty configuration files copied.${RC}"
}

checkEnv
checkEscalationTool
setupAlacritty
installAlacritty
setupAlacrittyConfig
Loading

0 comments on commit 2ae8ad9

Please sign in to comment.