diff --git a/build.sh b/build.sh index 679c6d8..14729b1 100755 --- a/build.sh +++ b/build.sh @@ -6,8 +6,9 @@ reconfigure="${reconfigure:-true}" version="${version:-1.1}" xresources="${xresources:-true}" cp_build="${cp_build:-false}" +prefix="${prefix:-/usr}" -check() { [ "$mac" != "false" ] && gen_manual="false"; } +check() { [ "$mac" != "false" ] && gen_manual="false" && prefix="/usr/local"; } loadconf() { [ ! -f spmenu.c ] && printf "You're probably in the wrong directory.\n" && exit 1 @@ -46,6 +47,7 @@ build() { -Dlibconfig="$libconfig" \ -Dopt="$opt" \ -Dutf8="$utf8" \ + --prefix "$prefix" \ build else meson setup \ @@ -59,6 +61,7 @@ build() { -Dlibconfig="$libconfig" \ -Dopt="$opt" \ -Dutf8="$utf8" \ + --prefix "$prefix" \ build fi diff --git a/buildconf b/buildconf index f50a5a3..1968123 100755 --- a/buildconf +++ b/buildconf @@ -17,3 +17,4 @@ opt=-O2 # level of optimization warn=true # warn about OS quirks install=true # automatically install, if set to false an install will not be performed reconfigure=true # reconfigure using meson +prefix=/usr # prefix diff --git a/docs/spmenu_desktop.desktop b/docs/spmenu_desktop.desktop new file mode 100644 index 0000000..336cb25 --- /dev/null +++ b/docs/spmenu_desktop.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=2.0 +Name=spmenu (Desktop) +Icon=spmenu +GenericName=Run launcher +Comment=List out .desktop entries +Exec=spmenu_run -d +Terminal=false +Type=Application diff --git a/docs/spmenu_filemanager.desktop b/docs/spmenu_filemanager.desktop new file mode 100644 index 0000000..0a59901 --- /dev/null +++ b/docs/spmenu_filemanager.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=2.0 +Name=spmenu (File manager) +Icon=spmenu +GenericName=Run launcher +Comment=List out files and directories +Exec=spmenu_run -fm +Terminal=false +Type=Application diff --git a/docs/spmenu_run.desktop b/docs/spmenu_run.desktop new file mode 100644 index 0000000..ed054f2 --- /dev/null +++ b/docs/spmenu_run.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=2.0 +Name=spmenu (Run) +Icon=spmenu +GenericName=Run launcher +Comment=List out PATH entries. +Exec=spmenu_run -x +Terminal=false +Type=Application diff --git a/meson.build b/meson.build index d65a58d..5406d12 100644 --- a/meson.build +++ b/meson.build @@ -87,6 +87,9 @@ install_data(sources : 'docs/docs.md', install_dir : 'share/spmenu') install_data(sources : 'docs/code-docs.md', install_dir : 'share/spmenu') install_data(sources : 'docs/example.Xresources', install_dir : 'share/spmenu') install_data(sources : 'docs/spmenu.conf', install_dir : 'share/spmenu') +install_data(sources : 'docs/spmenu_run.desktop', install_dir : 'share/applications') +install_data(sources : 'docs/spmenu_desktop.desktop', install_dir : 'share/applications') +install_data(sources : 'docs/spmenu_filemanager.desktop', install_dir : 'share/applications') install_data(sources : 'scripts/spmenu_run', install_dir : 'bin') install_data(sources : 'scripts/spmenu_test', install_dir : 'bin') diff --git a/scripts/spmenu_run b/scripts/spmenu_run index 4b0fca5..fe5d6f8 100755 --- a/scripts/spmenu_run +++ b/scripts/spmenu_run @@ -677,7 +677,7 @@ cache_desktop() { } clear_cache() { - rm -rf "${tmpdir[@]}" + rm -rf "${tmpdir[*]}" rm -f "${TITLEFILE}" "${FILEFILE}" "${EXECFILE}" "${ICONFILE}" "${DESCFILE}" }