Skip to content

Commit

Permalink
Remove install_desktop_file
Browse files Browse the repository at this point in the history
After the previous commits, install_desktop_file is now reduced to the
same functionality as install_data, so use this function.
  • Loading branch information
donald committed Nov 17, 2020
1 parent 42f274f commit e986c99
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ function install_if()
return 0
}

function install_desktop_file()
{
install_if "$1" "$2" $INSTALL_DATA
}

function install_exec()
{
install_if "$1" "$2" $INSTALL_PROGRAM
Expand Down Expand Up @@ -195,14 +190,12 @@ install_exec checktrust/lightdm-show-trust-warning "$DESTDIR$usr_exec_pre
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"

postinstall
exit

0 comments on commit e986c99

Please sign in to comment.