Skip to content

Fix for bee #136

Closed
wants to merge 3 commits into from
Closed
Changes from 1 commit
Commits
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
Prev Previous commit
install.sh: run update-desktop-database only once
Don't run update-desktop-database after each installed desktop file but
only once after all files are installed.
donald committed Nov 16, 2020
commit bf49c7ef7611e7c80ab474060ae2315ad67fc596
23 changes: 9 additions & 14 deletions install.sh
Original file line number Diff line number Diff line change
@@ -65,12 +65,6 @@ function install_if()
return 0
}

function install_desktop_file()
{
install_if "$1" "$2" $INSTALL_DATA
update-desktop-database $DESTDIR${desktopdir}
}

function install_exec()
{
install_if "$1" "$2" $INSTALL_PROGRAM
@@ -178,12 +172,13 @@ mkdir -p "$DESTDIR$sysconfdir/issue.d/"
install_symlink /node/issue.d/notrust.issue "$DESTDIR$sysconfdir/issue.d/notrust.issue"
install_data checktrust/getty-checktrust.service "$DESTDIR$systemdunitdir/getty-checktrust.service"
install_exec checktrust/getty-checktrust "$DESTDIR$usr_exec_prefix/libexec/getty-checktrust"
install_desktop_file desktop-files/org.inkscape.Inkscape.desktop \
"$DESTDIR$desktopdir/org.inkscape.Inkscape.desktop"
install_desktop_file desktop-files/rstudio.desktop "$DESTDIR$desktopdir/rstudio.desktop"
install_desktop_file desktop-files/meld3.desktop "$DESTDIR$desktopdir/meld3.desktop"
install_desktop_file desktop-files/ugene.desktop "$DESTDIR$desktopdir/ugene.desktop"
install_desktop_file desktop-files/org.octave.Octave.desktop \
"$DESTDIR$desktopdir/org.octave.Octave.desktop"
install_desktop_file desktop-files/igv.desktop "$DESTDIR$desktopdir/igv.desktop"
install_data desktop-files/org.inkscape.Inkscape.desktop "$DESTDIR$desktopdir/org.inkscape.Inkscape.desktop"
install_data desktop-files/rstudio.desktop "$DESTDIR$desktopdir/rstudio.desktop"
install_data desktop-files/meld3.desktop "$DESTDIR$desktopdir/meld3.desktop"
install_data desktop-files/ugene.desktop "$DESTDIR$desktopdir/ugene.desktop"
install_data desktop-files/org.octave.Octave.desktop "$DESTDIR$desktopdir/org.octave.Octave.desktop"
install_data desktop-files/igv.desktop "$DESTDIR$desktopdir/igv.desktop"

update-desktop-database "$DESTDIR$desktopdir"

exit