diff --git a/electron/configs/adb.js b/electron/configs/android-platform-tools/index.js similarity index 54% rename from electron/configs/adb.js rename to electron/configs/android-platform-tools/index.js index 4163b050..52415f4e 100644 --- a/electron/configs/adb.js +++ b/electron/configs/android-platform-tools/index.js @@ -3,11 +3,11 @@ import { extraResolve } from '@electron/helpers/index.js' export const getAdbPath = () => { switch (process.platform) { case 'win32': - return extraResolve('win/platform-tools/adb.exe') + return extraResolve('win/android-platform-tools/adb.exe') case 'darwin': - return extraResolve('mac/platform-tools/adb') + return extraResolve('mac/android-platform-tools/adb') case 'linux': - return extraResolve('linux/platform-tools/adb') + return extraResolve('linux/android-platform-tools/adb') } } diff --git a/electron/configs/index.js b/electron/configs/index.js index 465f8f65..99868ece 100644 --- a/electron/configs/index.js +++ b/electron/configs/index.js @@ -2,9 +2,9 @@ import { resolve } from 'node:path' import { buildResolve, extraResolve } from '@electron/helpers/index.js' -export { adbPath } from './adb.js' +export { adbPath } from './android-platform-tools/index.js' -export { scrcpyPath } from './scrcpy.js' +export { scrcpyPath } from './scrcpy/index.js' export const desktopPath = process.env.DESKTOP_PATH diff --git a/electron/configs/scrcpy.js b/electron/configs/scrcpy/index.js similarity index 100% rename from electron/configs/scrcpy.js rename to electron/configs/scrcpy/index.js diff --git a/electron/resources/extra/linux/platform-tools/NOTICE.txt b/electron/resources/extra/linux/android-platform-tools/NOTICE.txt similarity index 100% rename from electron/resources/extra/linux/platform-tools/NOTICE.txt rename to electron/resources/extra/linux/android-platform-tools/NOTICE.txt diff --git a/electron/resources/extra/linux/platform-tools/adb b/electron/resources/extra/linux/android-platform-tools/adb similarity index 100% rename from electron/resources/extra/linux/platform-tools/adb rename to electron/resources/extra/linux/android-platform-tools/adb diff --git a/electron/resources/extra/linux/platform-tools/etc1tool b/electron/resources/extra/linux/android-platform-tools/etc1tool similarity index 100% rename from electron/resources/extra/linux/platform-tools/etc1tool rename to electron/resources/extra/linux/android-platform-tools/etc1tool diff --git a/electron/resources/extra/linux/platform-tools/fastboot b/electron/resources/extra/linux/android-platform-tools/fastboot similarity index 100% rename from electron/resources/extra/linux/platform-tools/fastboot rename to electron/resources/extra/linux/android-platform-tools/fastboot diff --git a/electron/resources/extra/linux/platform-tools/hprof-conv b/electron/resources/extra/linux/android-platform-tools/hprof-conv similarity index 100% rename from electron/resources/extra/linux/platform-tools/hprof-conv rename to electron/resources/extra/linux/android-platform-tools/hprof-conv diff --git a/electron/resources/extra/linux/platform-tools/lib64/libc++.so b/electron/resources/extra/linux/android-platform-tools/lib64/libc++.so similarity index 100% rename from electron/resources/extra/linux/platform-tools/lib64/libc++.so rename to electron/resources/extra/linux/android-platform-tools/lib64/libc++.so diff --git a/electron/resources/extra/linux/platform-tools/make_f2fs b/electron/resources/extra/linux/android-platform-tools/make_f2fs similarity index 100% rename from electron/resources/extra/linux/platform-tools/make_f2fs rename to electron/resources/extra/linux/android-platform-tools/make_f2fs diff --git a/electron/resources/extra/linux/platform-tools/make_f2fs_casefold b/electron/resources/extra/linux/android-platform-tools/make_f2fs_casefold similarity index 100% rename from electron/resources/extra/linux/platform-tools/make_f2fs_casefold rename to electron/resources/extra/linux/android-platform-tools/make_f2fs_casefold diff --git a/electron/resources/extra/linux/platform-tools/mke2fs b/electron/resources/extra/linux/android-platform-tools/mke2fs similarity index 100% rename from electron/resources/extra/linux/platform-tools/mke2fs rename to electron/resources/extra/linux/android-platform-tools/mke2fs diff --git a/electron/resources/extra/linux/platform-tools/mke2fs.conf b/electron/resources/extra/linux/android-platform-tools/mke2fs.conf similarity index 100% rename from electron/resources/extra/linux/platform-tools/mke2fs.conf rename to electron/resources/extra/linux/android-platform-tools/mke2fs.conf diff --git a/electron/resources/extra/linux/platform-tools/source.properties b/electron/resources/extra/linux/android-platform-tools/source.properties similarity index 100% rename from electron/resources/extra/linux/platform-tools/source.properties rename to electron/resources/extra/linux/android-platform-tools/source.properties diff --git a/electron/resources/extra/linux/platform-tools/sqlite3 b/electron/resources/extra/linux/android-platform-tools/sqlite3 similarity index 100% rename from electron/resources/extra/linux/platform-tools/sqlite3 rename to electron/resources/extra/linux/android-platform-tools/sqlite3 diff --git a/electron/resources/extra/mac/platform-tools/NOTICE.txt b/electron/resources/extra/mac/android-platform-tools/NOTICE.txt similarity index 100% rename from electron/resources/extra/mac/platform-tools/NOTICE.txt rename to electron/resources/extra/mac/android-platform-tools/NOTICE.txt diff --git a/electron/resources/extra/mac/platform-tools/adb b/electron/resources/extra/mac/android-platform-tools/adb similarity index 100% rename from electron/resources/extra/mac/platform-tools/adb rename to electron/resources/extra/mac/android-platform-tools/adb diff --git a/electron/resources/extra/mac/platform-tools/etc1tool b/electron/resources/extra/mac/android-platform-tools/etc1tool similarity index 100% rename from electron/resources/extra/mac/platform-tools/etc1tool rename to electron/resources/extra/mac/android-platform-tools/etc1tool diff --git a/electron/resources/extra/mac/platform-tools/fastboot b/electron/resources/extra/mac/android-platform-tools/fastboot similarity index 100% rename from electron/resources/extra/mac/platform-tools/fastboot rename to electron/resources/extra/mac/android-platform-tools/fastboot diff --git a/electron/resources/extra/mac/platform-tools/hprof-conv b/electron/resources/extra/mac/android-platform-tools/hprof-conv similarity index 100% rename from electron/resources/extra/mac/platform-tools/hprof-conv rename to electron/resources/extra/mac/android-platform-tools/hprof-conv diff --git a/electron/resources/extra/mac/platform-tools/lib64/libc++.dylib b/electron/resources/extra/mac/android-platform-tools/lib64/libc++.dylib similarity index 100% rename from electron/resources/extra/mac/platform-tools/lib64/libc++.dylib rename to electron/resources/extra/mac/android-platform-tools/lib64/libc++.dylib diff --git a/electron/resources/extra/mac/platform-tools/make_f2fs b/electron/resources/extra/mac/android-platform-tools/make_f2fs similarity index 100% rename from electron/resources/extra/mac/platform-tools/make_f2fs rename to electron/resources/extra/mac/android-platform-tools/make_f2fs diff --git a/electron/resources/extra/mac/platform-tools/make_f2fs_casefold b/electron/resources/extra/mac/android-platform-tools/make_f2fs_casefold similarity index 100% rename from electron/resources/extra/mac/platform-tools/make_f2fs_casefold rename to electron/resources/extra/mac/android-platform-tools/make_f2fs_casefold diff --git a/electron/resources/extra/mac/platform-tools/mke2fs b/electron/resources/extra/mac/android-platform-tools/mke2fs similarity index 100% rename from electron/resources/extra/mac/platform-tools/mke2fs rename to electron/resources/extra/mac/android-platform-tools/mke2fs diff --git a/electron/resources/extra/mac/platform-tools/mke2fs.conf b/electron/resources/extra/mac/android-platform-tools/mke2fs.conf similarity index 100% rename from electron/resources/extra/mac/platform-tools/mke2fs.conf rename to electron/resources/extra/mac/android-platform-tools/mke2fs.conf diff --git a/electron/resources/extra/mac/platform-tools/source.properties b/electron/resources/extra/mac/android-platform-tools/source.properties similarity index 100% rename from electron/resources/extra/mac/platform-tools/source.properties rename to electron/resources/extra/mac/android-platform-tools/source.properties diff --git a/electron/resources/extra/mac/platform-tools/sqlite3 b/electron/resources/extra/mac/android-platform-tools/sqlite3 similarity index 100% rename from electron/resources/extra/mac/platform-tools/sqlite3 rename to electron/resources/extra/mac/android-platform-tools/sqlite3 diff --git a/electron/resources/extra/win/platform-tools/AdbWinApi.dll b/electron/resources/extra/win/android-platform-tools/AdbWinApi.dll similarity index 100% rename from electron/resources/extra/win/platform-tools/AdbWinApi.dll rename to electron/resources/extra/win/android-platform-tools/AdbWinApi.dll diff --git a/electron/resources/extra/win/platform-tools/AdbWinUsbApi.dll b/electron/resources/extra/win/android-platform-tools/AdbWinUsbApi.dll similarity index 100% rename from electron/resources/extra/win/platform-tools/AdbWinUsbApi.dll rename to electron/resources/extra/win/android-platform-tools/AdbWinUsbApi.dll diff --git a/electron/resources/extra/win/platform-tools/NOTICE.txt b/electron/resources/extra/win/android-platform-tools/NOTICE.txt similarity index 100% rename from electron/resources/extra/win/platform-tools/NOTICE.txt rename to electron/resources/extra/win/android-platform-tools/NOTICE.txt diff --git a/electron/resources/extra/win/platform-tools/adb.exe b/electron/resources/extra/win/android-platform-tools/adb.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/adb.exe rename to electron/resources/extra/win/android-platform-tools/adb.exe diff --git a/electron/resources/extra/win/platform-tools/etc1tool.exe b/electron/resources/extra/win/android-platform-tools/etc1tool.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/etc1tool.exe rename to electron/resources/extra/win/android-platform-tools/etc1tool.exe diff --git a/electron/resources/extra/win/platform-tools/fastboot.exe b/electron/resources/extra/win/android-platform-tools/fastboot.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/fastboot.exe rename to electron/resources/extra/win/android-platform-tools/fastboot.exe diff --git a/electron/resources/extra/win/platform-tools/hprof-conv.exe b/electron/resources/extra/win/android-platform-tools/hprof-conv.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/hprof-conv.exe rename to electron/resources/extra/win/android-platform-tools/hprof-conv.exe diff --git a/electron/resources/extra/win/platform-tools/libwinpthread-1.dll b/electron/resources/extra/win/android-platform-tools/libwinpthread-1.dll similarity index 100% rename from electron/resources/extra/win/platform-tools/libwinpthread-1.dll rename to electron/resources/extra/win/android-platform-tools/libwinpthread-1.dll diff --git a/electron/resources/extra/win/platform-tools/make_f2fs.exe b/electron/resources/extra/win/android-platform-tools/make_f2fs.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/make_f2fs.exe rename to electron/resources/extra/win/android-platform-tools/make_f2fs.exe diff --git a/electron/resources/extra/win/platform-tools/make_f2fs_casefold.exe b/electron/resources/extra/win/android-platform-tools/make_f2fs_casefold.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/make_f2fs_casefold.exe rename to electron/resources/extra/win/android-platform-tools/make_f2fs_casefold.exe diff --git a/electron/resources/extra/win/platform-tools/mke2fs.conf b/electron/resources/extra/win/android-platform-tools/mke2fs.conf similarity index 100% rename from electron/resources/extra/win/platform-tools/mke2fs.conf rename to electron/resources/extra/win/android-platform-tools/mke2fs.conf diff --git a/electron/resources/extra/win/platform-tools/mke2fs.exe b/electron/resources/extra/win/android-platform-tools/mke2fs.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/mke2fs.exe rename to electron/resources/extra/win/android-platform-tools/mke2fs.exe diff --git a/electron/resources/extra/win/platform-tools/source.properties b/electron/resources/extra/win/android-platform-tools/source.properties similarity index 100% rename from electron/resources/extra/win/platform-tools/source.properties rename to electron/resources/extra/win/android-platform-tools/source.properties diff --git a/electron/resources/extra/win/platform-tools/sqlite3.exe b/electron/resources/extra/win/android-platform-tools/sqlite3.exe similarity index 100% rename from electron/resources/extra/win/platform-tools/sqlite3.exe rename to electron/resources/extra/win/android-platform-tools/sqlite3.exe