diff --git a/README.md b/README.md index b9d9fc0d..92dc9126 100644 --- a/README.md +++ b/README.md @@ -102,15 +102,15 @@ want to skip this (perhaps to selected deleted files in `git status`), just run PathPicker is a combination of a bash script and some small Python modules. It essentially has three steps: -* First the bash script redirects all standard out in to a python module that +* Firstly, the bash script redirects all standard out in to a python module that parses and extracts out filename candidates. These candidates are extracted with a series of -regular expressions, since the input to PathPicker can be any stdout from another program. Rather +regular expressions since the input to PathPicker can be any stdout from another program. Rather than make specialized parsers for each program, we treat everything as noisy input and select candidates via regexes. To limit the number of calls to the filesystem (to check existence), we are fairly restrictive on the candidates we extract. This has the downside that files that are single words with no extension (like `test`) that are not prepended by -a directory will fail to match. This is a known limitation to PathPicker, and means that it will sometimes fail to find valid files in the input. +a directory will fail to match. This is a known limitation to PathPicker and means that it will sometimes fail to find valid files in the input. * Next, a selector UI built with `curses` is presented to the user. Here you can select a few files to edit or input a command to execute. diff --git a/debian/package.sh b/debian/package.sh index 231fe0cc..d3d6449d 100755 --- a/debian/package.sh +++ b/debian/package.sh @@ -47,7 +47,7 @@ find . -type f -exec chmod 644 {} \; echo "Building package..." rm "$PTH/package.sh" chmod 755 usr/share/pathpicker/fpp -fakeroot -- sh -c "chown -R root:root * && dpkg --build ./ ../fpp_${VERSION}_noarch.deb ;" +fakeroot -- sh -c "chown -R root:root * && dpkg --build ./ ../pathpicker_${VERSION}_all.deb ;" echo "Restoring template files..." cd - git checkout HEAD -- "$PTH/DEBIAN/control" "$PTH/usr/share/doc/pathpicker/changelog" "$PTH/package.sh" diff --git a/src/parse.py b/src/parse.py index 5e3ee9a5..7b7d41f2 100644 --- a/src/parse.py +++ b/src/parse.py @@ -332,7 +332,7 @@ def prependDir(file, withFileInspection=False): # already absolute, easy return '/' + file - if first in REPOS: + if first in REPOS + (os.environ.get('FPP_REPOS') or '').split(','): return os.path.expanduser('~/' + file) if '/' not in file: diff --git a/src/repos.py b/src/repos.py index 631de052..f1ed7067 100644 --- a/src/repos.py +++ b/src/repos.py @@ -10,4 +10,4 @@ # www/myFile.py # to: # ~/www/myFile.py -REPOS = ['www'] +REPOS = ['www', 'configerator', 'fbcode', 'configerator-dsi'] diff --git a/src/screenControl.py b/src/screenControl.py index 323909e8..edc1d581 100755 --- a/src/screenControl.py +++ b/src/screenControl.py @@ -499,7 +499,7 @@ def showAndGetCommand(self): paths = [pathObj.getPath() for pathObj in pathObjs] (maxy, maxx) = self.getScreenDimensions() - # Alright this is a bit tricy -- for tall screens, we try to aim + # Alright this is a bit tricky -- for tall screens, we try to aim # the command prompt right at the middle of the screen so you dont # have to shift your eyes down or up a bunch beginHeight = int(round(maxy / 2) - len(paths) / 2.0)