Changes based on feedback from @bassosimone

build.sh

@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 buildtags=""
 ldflags="-s -w"
 
-if [ "$1" = "bindata" ];then
+if [ "$1" = "bindata" ]; then
     GO_BINDATA_V=$(go-bindata -version | grep go-bin | cut -d ' ' -f2)
     [[ "$GO_BINDATA_V" == "3.2.0" ]] && echo "Updating bindata" || exit "Wrong go-bindata-version"
     go-bindata -nometadata -o internal/bindata/bindata.go -pkg bindata data/...

internal/database/actions.go

@@ -55,14 +55,14 @@ func GetMeasurementJSON(sess sqlbuilder.Database, measurementID int64) (map[stri
 		log.Errorf("failed to run query %s: %v", req.String(), err)
 		return nil, err
 	}
+	// MeasurementFilePath might be NULL because the measurement from a
+	// 3.0.0-beta install
 	if measurement.Measurement.MeasurementFilePath.Valid == false {
 		log.Error("invalid measurement_file_path")
 		log.Error("backup your OONI_HOME and run `ooniprobe reset`")
 		return nil, errors.New("cannot access measurement file")
 	}
 	measurementFilePath := measurement.Measurement.MeasurementFilePath.String
-	// TODO handle the case in which we have MeasurementFilePath == NULL because
-	// it's a beta measurement
 	b, err := ioutil.ReadFile(measurementFilePath)
 	if err != nil {
 		return nil, err