Skip to content

Commit

Permalink
Merge branch 'main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
jdjaxon committed Feb 20, 2024
2 parents 663a69c + ac9714f commit c7f8292
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: 'Static Analysis'

on:
workflow_call:
workflow_dispatch:
push:
branches:
- "*"
pull_request:
branches:
- "*"

jobs:
shellcheck:
name: ShellCheck
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ version and reinstall the browser with `apt`.
| | 22.04 LTS | Firefox, Chrome |
| PopOS! | 20.04 LTS | Firefox, Chrome |
| | 22.04 LTS | Firefox, Chrome |
| Mint | 21.2 | Firefox, Chrome |



There are reports of this script also working with both Linux Mint and the Brave
browser, but I have not tested these configurations.
Expand Down
7 changes: 2 additions & 5 deletions cac_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ backup_ff_profile ()
# Moves the user's backed up Firefox profile from the temp location to the newly
# installed apt version of Firefox in the ~/.mozilla directory
# TODO: Take arguments for source and destination so profile can be restored to
# TODO: original location in the event of a failed install
# original location in the event of a failed install
migrate_ff_profile ()
{
direction=$1
Expand Down Expand Up @@ -474,9 +474,8 @@ check_for_ff_pin ()
repin_firefox ()
{
print_info "Attempting to repin Firefox to favorites bar..."
if [ $ff_was_pinned == true ]
if [ "$ff_was_pinned" == true ]
then

# TODO: finish this

curr_favorites=$(gsettings get org.gnome.shell favorite-apps)
Expand All @@ -485,9 +484,7 @@ repin_firefox ()
gsettings set org.gnome.shell favorite-apps "$(gsettings get org.gnome.shell favorite-apps | sed s/.$//), 'firefox.desktop']"

print_info "Done."

fi

} # repin_firefox

main

0 comments on commit c7f8292

Please sign in to comment.