Skip to content

Detect newer GCC, and quiet a desktop-file-validate warning #2

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

Open
jason-c-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Detect newer GCC, and quiet a desktop-file-validate warning #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions granola-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ info "7zz: $SEVENZZ"


CXX=""
for v in 15 14 13 12 11; do
# Newest first. A fixed list goes stale every time GCC ships a major release,
# and the failure is confusing: a box with only g++-16 installed under a
# versioned name gets told it needs "g++ 11 or newer".
for v in $(seq 30 -1 11); do
if command -v "g++-$v" >/dev/null; then CXX="g++-$v"; CC="gcc-$v"; break; fi
done
if [[ -z "$CXX" ]] && command -v g++ >/dev/null; then
Expand Down Expand Up @@ -161,7 +164,7 @@ Comment=AI Notepad for meetings
Exec=$INSTALL_DIR/granola.sh %U
Icon=$INSTALL_DIR/granola-icon.png
Terminal=false
Categories=Office;Utility;
Categories=Office;
StartupWMClass=granola
MimeType=x-scheme-handler/granola;
EOF
Expand Down