Quiet down and stop speaking nonsense!
This commit is contained in:
parent
999e8dfb5c
commit
fcc6c6c5b5
|
@ -118,11 +118,14 @@ function askForConfig(answers, mainCb) {
|
||||||
function askEmail(cb) {
|
function askEmail(cb) {
|
||||||
if (answers.email) { cb(); return; }
|
if (answers.email) { cb(); return; }
|
||||||
console.info("");
|
console.info("");
|
||||||
|
console.info("Welcome!");
|
||||||
console.info("");
|
console.info("");
|
||||||
console.info("Telebit uses Greenlock for free automated ssl through Let's Encrypt.");
|
console.info("By using Telebit you agree to:");
|
||||||
console.info("");
|
console.info("");
|
||||||
console.info("To accept the Terms of Service for Telebit, Greenlock and Let's Encrypt,");
|
console.info(" [x] Accept the Telebit™ terms of service");
|
||||||
console.info("please enter your email.");
|
console.info(" [x] Accept the Let's Encrypt™ terms of service");
|
||||||
|
console.info("");
|
||||||
|
console.info("Enter your email to agree and create your account:");
|
||||||
console.info("");
|
console.info("");
|
||||||
// TODO attempt to read email from npmrc or the like?
|
// TODO attempt to read email from npmrc or the like?
|
||||||
rl.question('email: ', function (email) {
|
rl.question('email: ', function (email) {
|
||||||
|
@ -561,19 +564,21 @@ function parseConfig(err, text) {
|
||||||
|
|
||||||
// need just a little time to let the grants occur
|
// need just a little time to let the grants occur
|
||||||
setTimeout(function () {
|
setTimeout(function () {
|
||||||
utils.putConfig('list', [], function (err) {
|
utils.putConfig('enable', [], function () {
|
||||||
if (err) { console.error(err); return; }
|
utils.putConfig('list', [], function (err) {
|
||||||
console.log("Success");
|
if (err) { console.error(err); return; }
|
||||||
// workaround for https://github.com/nodejs/node/issues/21319
|
console.log("Success");
|
||||||
if (answers._useTty) {
|
// workaround for https://github.com/nodejs/node/issues/21319
|
||||||
setTimeout(function () {
|
if (answers._useTty) {
|
||||||
console.log();
|
setTimeout(function () {
|
||||||
console.log("Press any key to continue...");
|
console.log();
|
||||||
console.log();
|
console.log("Press any key to continue...");
|
||||||
process.exit(0);
|
console.log();
|
||||||
}, 0.5 * 1000);
|
process.exit(0);
|
||||||
}
|
}, 0.5 * 1000);
|
||||||
// end workaround
|
}
|
||||||
|
// end workaround
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
}, 1 * 1000);
|
}, 1 * 1000);
|
||||||
|
|
|
@ -428,7 +428,9 @@ sleep 1
|
||||||
###############################
|
###############################
|
||||||
# Actually Launch the Service #
|
# Actually Launch the Service #
|
||||||
###############################
|
###############################
|
||||||
echo ""
|
if [ -n "${TELEBIT_DEBUG}" ]; then
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
if [ "launchd" == "$my_system_launcher" ]; then
|
if [ "launchd" == "$my_system_launcher" ]; then
|
||||||
|
|
||||||
if [ "yes" == "$TELEBIT_USERSPACE" ]; then
|
if [ "yes" == "$TELEBIT_USERSPACE" ]; then
|
||||||
|
@ -520,7 +522,5 @@ if [ -n "${TELEBIT_DEBUG}" ]; then
|
||||||
fi
|
fi
|
||||||
sleep 0.25
|
sleep 0.25
|
||||||
|
|
||||||
|
echo ""
|
||||||
$TELEBIT_REAL_PATH/bin/node $TELEBIT_REAL_PATH/bin/telebit.js init --tty
|
$TELEBIT_REAL_PATH/bin/node $TELEBIT_REAL_PATH/bin/telebit.js init --tty
|
||||||
|
|
||||||
$TELEBIT_REAL_PATH/bin/node $TELEBIT_REAL_PATH/bin/telebit.js enable
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue