Skip to content
Snippets Groups Projects
Commit 3f749cba authored by DFN2's avatar DFN2
Browse files

Merge branch 'include_imwhell' into 'master'

Include imwhell

See merge request dfn2/pling-store!4
parents 3093b238 a9c857aa
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,8 @@ if [ ${APPIMAGE} ]; then ...@@ -9,6 +9,8 @@ if [ ${APPIMAGE} ]; then
export PATH=${PREFIX}/usr/local/bin:${PREFIX}/usr/bin:${PATH} export PATH=${PREFIX}/usr/local/bin:${PREFIX}/usr/bin:${PATH}
fi fi
HOME=${PREFIX}/usr/share/imwheel ocs-imwheel
if [ -f "${PREFIX}/pling-store-linux-x64/pling-store" ]; then if [ -f "${PREFIX}/pling-store-linux-x64/pling-store" ]; then
${PREFIX}/pling-store-linux-x64/pling-store ${PREFIX}/pling-store-linux-x64/pling-store
elif [ -f "${PREFIX}/usr/local/lib/pling-store-linux-x64/pling-store" ]; then elif [ -f "${PREFIX}/usr/local/lib/pling-store-linux-x64/pling-store" ]; then
...@@ -18,5 +20,8 @@ elif [ -f "${PREFIX}/usr/lib/pling-store-linux-x64/pling-store" ]; then ...@@ -18,5 +20,8 @@ elif [ -f "${PREFIX}/usr/lib/pling-store-linux-x64/pling-store" ]; then
elif [ -f "${PREFIX}/../lib/pling-store-linux-x64/pling-store" ]; then elif [ -f "${PREFIX}/../lib/pling-store-linux-x64/pling-store" ]; then
${PREFIX}/../lib/pling-store-linux-x64/pling-store ${PREFIX}/../lib/pling-store-linux-x64/pling-store
else else
pkill ocs-imwheel
exit 1 exit 1
fi fi
pkill ocs-imwheel
\ No newline at end of file
...@@ -22,6 +22,10 @@ install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/ ...@@ -22,6 +22,10 @@ install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/
curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/d3dc42436b82d11360ebc96b38d4aaf4/ocs-manager-0.8.1-1-x86_64.AppImage curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/d3dc42436b82d11360ebc96b38d4aaf4/ocs-manager-0.8.1-1-x86_64.AppImage
install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager
IMWHEEL_PATH=`which imwheel`
install -D -m 755 ${IMWHEEL_PATH} ${APPDIR}/usr/bin/ocs-imwheel
install -D -m 644 imwheel.conf ${APPDIR}/usr/share/imwheel/.imwheelrc
curl -fsSL -o appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage curl -fsSL -o appimagetool https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
chmod 755 appimagetool chmod 755 appimagetool
./appimagetool --appimage-extract ./appimagetool --appimage-extract
......
"^pling-store$"
None, Up, Button4, 2
None, Down, Button5, 2
...@@ -23,7 +23,7 @@ install_build_deps_appimage() { ...@@ -23,7 +23,7 @@ install_build_deps_appimage() {
git clone https://github.com/tj/n.git -b master --single-branch --depth=1 "${PROJDIR}/n" git clone https://github.com/tj/n.git -b master --single-branch --depth=1 "${PROJDIR}/n"
(cd "${PROJDIR}/n" && make install && n lts) (cd "${PROJDIR}/n" && make install && n lts)
rm -rf "${PROJDIR}/n" rm -rf "${PROJDIR}/n"
apt -y install libgconf-2-4 libxss1 libcanberra-gtk-module libgnome-keyring0 apt -y install libgconf-2-4 libxss1 libcanberra-gtk-module libgnome-keyring0 imwheel
} }
build_appimage() { build_appimage() {
...@@ -32,6 +32,7 @@ build_appimage() { ...@@ -32,6 +32,7 @@ build_appimage() {
export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz" export_srcarchive "${BUILDDIR}/${PKGNAME}.tar.gz"
tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}" tar -xzf "${BUILDDIR}/${PKGNAME}.tar.gz" -C "${BUILDDIR}"
cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}" cp "${PROJDIR}/pkg/appimage/appimagebuild" "${BUILDDIR}/${PKGNAME}"
cp "${PROJDIR}/pkg/appimage/imwheel.conf" "${BUILDDIR}/${PKGNAME}"
cd "${BUILDDIR}/${PKGNAME}" cd "${BUILDDIR}/${PKGNAME}"
./appimagebuild ./appimagebuild
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment