diff --git a/gui/electron/tor.js b/gui/electron/tor.js index 3e5f4b6..d3aeca3 100644 --- a/gui/electron/tor.js +++ b/gui/electron/tor.js @@ -5,9 +5,10 @@ const getPort = require('get-port'); async function launchTor() { const socks = await getPort(); const control = await getPort(); - const exe = path.join(__dirname, 'resources', 'tor', process.platform, + const torBase = path.join(__dirname, '..', '..', 'voxvera', 'resources', 'tor'); + const exe = path.join(torBase, process.platform, process.platform === 'win32' ? 'tor.exe' : 'tor'); - const obfs4 = path.join(__dirname, 'resources', 'tor', process.platform, + const obfs4 = path.join(torBase, process.platform, process.platform === 'win32' ? 'obfs4proxy.exe' : 'obfs4proxy'); const args = [ diff --git a/packaging/build_appimage.sh b/packaging/build_appimage.sh index 5e58a12..3804bdf 100755 --- a/packaging/build_appimage.sh +++ b/packaging/build_appimage.sh @@ -12,6 +12,9 @@ cp dist/voxvera "$APPDIR/usr/bin/voxvera" chmod +x "$APPDIR/usr/bin/voxvera" mkdir -p "$APPDIR/usr/lib/voxvera/resources" cp -r voxvera/resources/tor "$APPDIR/usr/lib/voxvera/resources/" +# also bundle Tor for the Electron GUI +mkdir -p gui/electron/voxvera/resources +cp -r voxvera/resources/tor gui/electron/voxvera/resources/ cat > "$APPDIR/voxvera.desktop" <