Skip to content

Commit

Permalink
Various changes for updater.
Browse files Browse the repository at this point in the history
  • Loading branch information
skleinei committed Apr 18, 2017
1 parent 02f2bcc commit 851bdde
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Just hit `⌘ Space` and type `c search term` to search for Confluence page.

## Getting Started

In order to get started
In order to get started:

1. Download the latest version of Alfred Confluence from the [Github releases page](https://github.com/skleinei/alfred-confluence/releases).
* Click on the release you want to download.
Expand Down Expand Up @@ -79,9 +79,11 @@ $ make all

In order to release a new version:

1. Bump the version numbers (semantic version numbering!) in both files:
* `Info.plist` (2x: at the very end of the file AND line ~110 (for the workflow name))
* `alfred-confluence.py` (line ~15)
1. Bump the version numbers (semantic version numbering!) in these files:
* `src/Info.plist` (2x: at the very end of the file AND line ~110 (for the workflow name))
* `src/alfred-confluence.py` (line ~15)
* `version`
* `src/version`
2. Commit all changes.
3. Create a release on [Github](https://help.github.com/categories/releases/)
and use the same version number.
Expand Down
9 changes: 5 additions & 4 deletions src/alfred-confluence.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import json
import sys
from HTMLParser import HTMLParser
from lib.workflow import Workflow, web, PasswordNotFound
from lib.workflow import Workflow, ICON_INFO, web, PasswordNotFound
from os.path import expanduser
from urlparse import urlparse

Expand Down Expand Up @@ -159,11 +159,12 @@ def getBaseUrlWithoutPath(baseUrl):
})
htmlParser = HTMLParser()
log = wf.logger
sys.exit(wf.run(main))

if wf.update_available:
# Add a notification to top of Script Filter results
wf.add_item('New version available',
'Action this item to install the update',
wf.add_item('New version of the Alfred Confluence workflow available',
'Hit enter twice to to install the update.',
autocomplete='workflow:update',
icon=ICON_INFO)

sys.exit(wf.run(main))
2 changes: 1 addition & 1 deletion src/info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ This workflow is licensed under the MIT License.
MIT License
Copyright (c) 2016 Typefacts.com
Copyright (c) 2017 K15t Software
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
Expand Down
1 change: 0 additions & 1 deletion src/version

This file was deleted.

1 change: 0 additions & 1 deletion version

This file was deleted.

0 comments on commit 851bdde

Please sign in to comment.