Minor bugfixes to install script and version number

* Silencing output from install script
* `git describe` should use lightweight tags
This commit is contained in:
englehardt 2016-04-27 12:18:14 -04:00
Родитель 8f3f4a30ce
Коммит 0a7e305b8f
3 изменённых файлов: 3 добавлений и 4 удалений

Просмотреть файл

@ -1,4 +1,4 @@
OpenWPM[![Build Status](https://travis-ci.org/citp/OpenWPM.svg)](https://travis-ci.org/citp/OpenWPM)
OpenWPM [![Build Status](https://travis-ci.org/citp/OpenWPM.svg)](https://travis-ci.org/citp/OpenWPM)
=======
OpenWPM is a web privacy measurement framework which makes it easy to collect

Просмотреть файл

@ -8,12 +8,11 @@ import subprocess
import shutil
import json
import time
import sys
import os
def get_version():
"""Return OpenWPM version tag/current commit and Firefox version """
openwpm = subprocess.check_output(["git","describe","--always"]).strip()
openwpm = subprocess.check_output(["git","describe","--tags","--always"]).strip()
ff_ini = os.path.join(os.path.dirname(__file__), '../firefox-bin/application.ini')
with open(ff_ini, 'r') as f:

Просмотреть файл

@ -1,5 +1,5 @@
#!/bin/bash
set -ev
set -e
echo "Would you like to install Adobe Flash Player? (Only required for crawls with Flash) [y,N]"
read -s -n 1 response