Commit dd46e2b7 authored by akiraohgaki's avatar akiraohgaki

Merge branch 'develop'

parents 556ecde2 bf9c6004
Pipeline #326 passed with stage
in 2 minutes and 4 seconds
......@@ -19,8 +19,6 @@ let mainWindow = null;
let ocsManager = null;
let ocsManagerUrl = '';
app.disableHardwareAcceleration();
async function startOcsManager() {
return new Promise((resolve) => {
const resolveOcsManagerUrl = (data) => {
......
"^ocs-store$"
None, Up, Button4, 10
None, Down, Button5, 10
......@@ -7,6 +7,7 @@ PREFIX="$(cd "$(dirname "${0}")" && pwd)"
if [ ${APPIMAGE} ]; then
export PATH=${PREFIX}/usr/local/bin:${PREFIX}/usr/bin:${PATH}
imwheel
fi
if [ -f "${PREFIX}/ocs-store-linux-x64/ocs-store" ]; then
......
......@@ -19,6 +19,23 @@ install -D -m 755 /usr/lib/x86_64-linux-gnu/libXss.so.1 ${APPDIR}/usr/lib/ocs-st
install -D -m 755 /usr/lib/x86_64-linux-gnu/gtk-2.0/modules/libcanberra-gtk-module.so ${APPDIR}/usr/lib/ocs-store-linux-x64/libcanberra-gtk-module.so
install -D -m 755 /usr/lib/x86_64-linux-gnu/libgnome-keyring.so.0 ${APPDIR}/usr/lib/ocs-store-linux-x64/libgnome-keyring.so.0
install -D -m 644 launcher/imwheelrc ${APPDIR}/etc/imwheelrc
install -D -m 644 /etc/X11/Xsession.d/60imwheel_start-imwheel ${APPDIR}/etc/X11/Xsession.d/60imwheel_start-imwheel
install -D -m 644 /etc/X11/imwheel/imwheelrc ${APPDIR}/etc/X11/imwheel/imwheelrc
install -D -m 644 /etc/X11/imwheel/startup.conf ${APPDIR}/etc/X11/imwheel/startup.conf
install -D -m 755 /usr/bin/imwheel ${APPDIR}/usr/bin/imwheel
#install -D -m 755 /usr/lib/imwheel/getmdt ${APPDIR}/usr/lib/imwheel/getmdt
#install -D -m 755 /usr/lib/imwheel/mdetect ${APPDIR}/usr/lib/imwheel/mdetect
#install -D -m 755 /usr/lib/imwheel/mdump ${APPDIR}/usr/lib/imwheel/mdump
#install -D -m 755 /usr/lib/imwheel/mice/a4tech ${APPDIR}/usr/lib/imwheel/mice/a4tech
#install -D -m 755 /usr/lib/imwheel/mice/default ${APPDIR}/usr/lib/imwheel/mice/default
#install -D -m 755 /usr/lib/imwheel/mice/intellimouse ${APPDIR}/usr/lib/imwheel/mice/intellimouse
#install -D -m 755 /usr/lib/imwheel/mice/mouseman+ ${APPDIR}/usr/lib/imwheel/mice/mouseman+
#install -D -m 755 /usr/lib/imwheel/mice/netmouse ${APPDIR}/usr/lib/imwheel/mice/netmouse
#install -D -m 755 /usr/lib/imwheel/see ${APPDIR}/usr/lib/imwheel/see
#install -D -m 755 /usr/lib/imwheel/setimps2 ${APPDIR}/usr/lib/imwheel/setimps2
#install -D -m 755 /usr/lib/imwheel/setmmplus ${APPDIR}/usr/lib/imwheel/setmmplus
curl -fsSL -o ocs-manager https://git.opendesktop.org/akiraohgaki/ocs-manager/uploads/ebf99a67dcd30bc57cfa371cac1f959e/ocs-manager-0.7.2-1-x86_64.AppImage
install -D -m 755 ocs-manager ${APPDIR}/usr/bin/ocs-manager
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment