From 5708a055f3f47d315543e91510a63087b97abfe0 Mon Sep 17 00:00:00 2001 From: Eik-S Date: Tue, 5 Mar 2019 14:46:03 +0100 Subject: [PATCH 1/4] linux installer, readme and more advanced build process added --- .gitignore | 3 ++- package.json | 8 ++------ scripts/MemexBackupHelper.desktop | 9 +++++++++ scripts/build.sh | 18 ++++++++++++++++++ scripts/linux-installer.sh | 8 ++++++++ scripts/readme.URL | 2 ++ 6 files changed, 41 insertions(+), 7 deletions(-) create mode 100755 scripts/MemexBackupHelper.desktop create mode 100755 scripts/build.sh create mode 100644 scripts/linux-installer.sh create mode 100644 scripts/readme.URL diff --git a/.gitignore b/.gitignore index 6c8b15b..6c0c7df 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ backup/* .DS_Store local-backup-server-* .vscode -dist \ No newline at end of file +dist +backup_location.txt \ No newline at end of file diff --git a/package.json b/package.json index 53edeb3..e0b3eed 100644 --- a/package.json +++ b/package.json @@ -23,14 +23,10 @@ "mkdirp": "^0.5.1" }, "build": { - "nwVersion": "0.35.5", - "targets": [ - "zip" - ] + "nwVersion": "0.35.5" }, "scripts": { - "dist": "build --tasks win-x64,linux-x64,mac-x64 --mirror https://dl.nwjs.io/ . --concurrent", - "mac": "build --tasks mac-x64 --mirror https://dl.nwjs.io/ . --concurrent" + "dist": "./scripts/build.sh" }, "devDependencies": { "nwjs-builder-phoenix": "^1.15.0" diff --git a/scripts/MemexBackupHelper.desktop b/scripts/MemexBackupHelper.desktop new file mode 100755 index 0000000..395a23f --- /dev/null +++ b/scripts/MemexBackupHelper.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=0.4 +Type=Application +Terminal=false +Exec=/usr/local/bin/MemexBackupHelper/memex-backup-helper +Name=Memex Backup Helper +Comment=Memex Local Backup Helper +Icon=/usr/local/bin/MemexBackupHelper/img/appIcon.png +Categories=Utility;Application; \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..7a1e655 --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,18 @@ +#!/bin/bash +build --tasks win-x64,linux-x64,mac-x64 --mirror https://dl.nwjs.io/ . --concurrent +cp ./scripts/MemexBackupHelper.desktop ./dist/memex-backup-helper-*-linux-x64/ +cd ./dist/memex-backup-helper-*-linux-x64/ +mkdir src +# allow ! by setting dotglob in optional shell behavior +shopt -s extglob dotglob +mv !(src) ./src/ +# unset dotglob for default bash behavior +shopt -u dotglob +cd ./../../ +cp ./scripts/linux-installer.sh ./dist/memex-backup-helper-*-linux-x64/ +chmod +x ./dist/memex-backup-helper-*-linux-x64/linux-installer.sh +echo ./dist/memex-backup-helper-*-x64 | xargs -n 1 cp ./scripts/readme.URL +cd ./dist +# zip the dist directories +# disabled because of super huge filesize using zip for the mac folder +# find . -iname "memex-backup-helper-*-x64" -print0 -maxdepth 1 | xargs -0 -I folder zip -r ./folder.zip ./folder \ No newline at end of file diff --git a/scripts/linux-installer.sh b/scripts/linux-installer.sh new file mode 100644 index 0000000..55204e2 --- /dev/null +++ b/scripts/linux-installer.sh @@ -0,0 +1,8 @@ +#!/bin/sh +mkdir /usr/local/bin/MemexBackupHelper +cd ./src +shopt -s extglob dotglob +cp -r !(MemexBackupHelper.desktop) /usr/local/bin/MemexBackupHelper +shopt -u dotglob +cp ./MemexBackupHelper.desktop ~/.local/share/applications/ +chmod +x ~/.local/share/applications/MemexBackupHelper.desktop \ No newline at end of file diff --git a/scripts/readme.URL b/scripts/readme.URL new file mode 100644 index 0000000..47b2ebc --- /dev/null +++ b/scripts/readme.URL @@ -0,0 +1,2 @@ +[InternetShortcut] +URL=https://www.notion.so/worldbrain/Download-Memex-Backup-App-7dacad9e95b44c5db681033fc264fb59 \ No newline at end of file From dd562a6140d406abd8c78e7843bda1c368dfbbbc Mon Sep 17 00:00:00 2001 From: Eik-S Date: Tue, 5 Mar 2019 14:47:25 +0100 Subject: [PATCH 2/4] installer script is using bash to use shopt --- scripts/linux-installer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/linux-installer.sh b/scripts/linux-installer.sh index 55204e2..9c5f464 100644 --- a/scripts/linux-installer.sh +++ b/scripts/linux-installer.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash mkdir /usr/local/bin/MemexBackupHelper cd ./src shopt -s extglob dotglob From 4d32bb30001dd11171303cb4a090acfbb95dcb22 Mon Sep 17 00:00:00 2001 From: Eik-S Date: Wed, 6 Mar 2019 14:01:58 +0100 Subject: [PATCH 3/4] fixed bugs in desktop and installer file, using absolute path in .desktop file --- scripts/MemexBackupHelper.desktop | 9 --------- scripts/build.sh | 2 +- scripts/linux-installer.sh | 12 +++++------- scripts/memex-backup-helper.desktop | 9 +++++++++ 4 files changed, 15 insertions(+), 17 deletions(-) delete mode 100755 scripts/MemexBackupHelper.desktop create mode 100755 scripts/memex-backup-helper.desktop diff --git a/scripts/MemexBackupHelper.desktop b/scripts/MemexBackupHelper.desktop deleted file mode 100755 index 395a23f..0000000 --- a/scripts/MemexBackupHelper.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=0.4 -Type=Application -Terminal=false -Exec=/usr/local/bin/MemexBackupHelper/memex-backup-helper -Name=Memex Backup Helper -Comment=Memex Local Backup Helper -Icon=/usr/local/bin/MemexBackupHelper/img/appIcon.png -Categories=Utility;Application; \ No newline at end of file diff --git a/scripts/build.sh b/scripts/build.sh index 7a1e655..8a381f2 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,6 @@ #!/bin/bash build --tasks win-x64,linux-x64,mac-x64 --mirror https://dl.nwjs.io/ . --concurrent -cp ./scripts/MemexBackupHelper.desktop ./dist/memex-backup-helper-*-linux-x64/ +cp ./scripts/memex-backup-helper.desktop ./dist/memex-backup-helper-*-linux-x64/ cd ./dist/memex-backup-helper-*-linux-x64/ mkdir src # allow ! by setting dotglob in optional shell behavior diff --git a/scripts/linux-installer.sh b/scripts/linux-installer.sh index 9c5f464..e10e8c7 100644 --- a/scripts/linux-installer.sh +++ b/scripts/linux-installer.sh @@ -1,8 +1,6 @@ -#!/bin/bash -mkdir /usr/local/bin/MemexBackupHelper +#!/bin/sh +mkdir -p ~/.memex-backup-helper cd ./src -shopt -s extglob dotglob -cp -r !(MemexBackupHelper.desktop) /usr/local/bin/MemexBackupHelper -shopt -u dotglob -cp ./MemexBackupHelper.desktop ~/.local/share/applications/ -chmod +x ~/.local/share/applications/MemexBackupHelper.desktop \ No newline at end of file +sed -e "s/%%user%%/$USER/g" ./memex-backup-helper.desktop > ~/.local/share/applications/memex-backup-helper.desktop +\cp -r ./* ~/.memex-backup-helper/ +rm ~/.memex-backup-helper/memex-backup-helper.desktop \ No newline at end of file diff --git a/scripts/memex-backup-helper.desktop b/scripts/memex-backup-helper.desktop new file mode 100755 index 0000000..f41274b --- /dev/null +++ b/scripts/memex-backup-helper.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Terminal=false +Exec=/home/%%user%%/.memex-backup-helper/memex-backup-helper +Name=Memex Backup Helper +Comment=Memex Local Backup Helper +Icon=/home/%%user%%/.memex-backup-helper/img/appIcon.png +Categories=Application; \ No newline at end of file From 1212b35af6a74d12bf7a1d12747642b4040aee4e Mon Sep 17 00:00:00 2001 From: Eik-S Date: Wed, 6 Mar 2019 14:03:09 +0100 Subject: [PATCH 4/4] stop ignoring backup_location.txt --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c0c7df..6c8b15b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,4 @@ backup/* .DS_Store local-backup-server-* .vscode -dist -backup_location.txt \ No newline at end of file +dist \ No newline at end of file