diff --git a/Config/F-DroidRepo/prep.sh b/Config/F-DroidRepo/prep.sh index 587aaae..d04d16c 100755 --- a/Config/F-DroidRepo/prep.sh +++ b/Config/F-DroidRepo/prep.sh @@ -19,19 +19,13 @@ mkdir -pv $FDROID_DATA keystore="$DIR"/files/keystore.p12 if [[ ! -f "$keystore" ]]; then - echo "ERROR: $keystore not detected. Please create it using 'keytool', like this:" - cat <<- EOF + echo "ERROR: $keystore not detected. Please create it and config.yml using 'fdroid init'." + exit 1 +fi - keytool -genkeypair -v \\ - -storetype PKCS12 \\ - -keystore keystore.p12 \\ - -alias fdroid \\ - -keyalg RSA -keysize 4096 \\ - -validity 10000 \\ - -dname "CN=YourName, OU=F-Droid" - - EOF - echo "It will ask for passwords, it's recommended to make them both the same." +config="$DIR"/files/config.yml +if [[ ! -f "$config" ]]; then + echo "ERROR: $config not detected. Please copy the file that came with your keystore.p12 from 'fdroid init'." exit 1 fi