Skip to content
This repository has been archived by the owner on Jun 19, 2021. It is now read-only.

Commit

Permalink
Fix #45 with a narrower ignore parameter
Browse files Browse the repository at this point in the history
  • Loading branch information
skullydazed committed Jun 10, 2017
1 parent 183947d commit 8cf362a
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions dist-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ check_zip() {
}

# Make sure our environment is setup properly
if [ -d "$output_dir" ]; then
echo '*** About to wipe out the '"$output_dir"' directory.'
if [ -d "$output_dir" -o -d "dist" ]; then
echo '*** About to wipe out the '"$output_dir"' and "dist" directory.'
echo '*** You have 10 seconds to press Ctrl-C!'
for i in 10 9 8 7 6 5 4 3 2 1; do
echo "*** $i"
sleep 1
done
rm -r "$output_dir"
rm -r "$output_dir" "dist"
fi

if ! [ -d dfu -a -d src ]; then
Expand Down
2 changes: 1 addition & 1 deletion dist-darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ electron-packager ./ --platform=$plat --arch=$arch \
--out="$output_dir" \
--overwrite=true \
--prune \
--ignore '.*dist/.*'
--ignore 'dist/darwin'

# Zip up the OSX package
echo '*** Creating package archive.'
Expand Down
2 changes: 1 addition & 1 deletion dist-win32.bat
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ set PACKAGE_DIR="%OUTPUT_DIR%\QMK Flasher-%PLATFORM%-%ARCH%"

call npm install

call electron-packager . --platform=%PLATFORM% --arch=%ARCH% --out %OUTPUT_DIR% --overwrite
call electron-packager . --platform=%PLATFORM% --arch=%ARCH% --out %OUTPUT_DIR% --overwrite=true --asar.unpackDir=**/{dfu,node_modules/fsevents} --icon=build\windows.ico --prune

copy qmk_flasher.win32.nsi %PACKAGE_DIR%
2 changes: 1 addition & 1 deletion dist-win32.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ electron-packager ./ --platform=$plat --arch=$arch \
--out "$output_dir" \
--overwrite=true \
--prune \
--ignore '.*dist/.*'
--ignore 'dist/win32'
cp build/windows.ico qmk_flasher.win32.nsi "${output_dir}/${package_dir}"

# Zip up the package
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qmk-firmware-flasher",
"productName": "QMK Flasher",
"version": "0.5.1",
"version": "0.5.2",
"description": "GUI app to load firmware onto atmega32u4 chips.",
"main": "src/main.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion qmk_flasher.win32.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# These three must be integers
!define VERSIONMAJOR 0
!define VERSIONMINOR 5
!define VERSIONBUILD 1
!define VERSIONBUILD 2
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
# It is possible to use "mailto:" links in here to open the email client
!define HELPURL "https://github.com/qmk/qmk_firmware_flasher/issues" # "Support Information" link
Expand Down

0 comments on commit 8cf362a

Please sign in to comment.