From 1de4feca4594337adc57f5e048c5351364c4a6b6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 12 May 2018 18:29:50 +0100 Subject: [PATCH] Add debug --- src/freedombone-upgrade | 3 --- src/freedombone-utils-web | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade index 83976b3e..33f73ab4 100755 --- a/src/freedombone-upgrade +++ b/src/freedombone-upgrade @@ -90,15 +90,12 @@ if [ -d "$PROJECT_DIR" ]; then chmod -R +r /usr/share/${PROJECT_NAME} fi - echo "test0" if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then exit 453536 fi #rebuild_exim_with_socks - echo "test1" install_dynamicdns - echo "test2" torrc_migrate nodejs_upgrade apt-get -yq -t stretch-backports install certbot diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index b5d8f8d8..97bb43ab 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -475,18 +475,23 @@ function upgrade_inadyn_config { } function install_dynamicdns { + echo "************ 1" if [[ $SYSTEM_TYPE == "mesh"* ]]; then return fi + + echo "************ 2" if [[ $ONION_ONLY != "no" ]]; then return fi + echo "************ 3" CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit") if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then return fi + echo "************ 4" if [ -f /usr/local/sbin/inadyn ]; then if [ -d "$INSTALL_DIR/inadyn" ]; then rm -rf "$INSTALL_DIR/inadyn" @@ -506,6 +511,7 @@ function install_dynamicdns { apt-get -yq install build-essential curl libgnutls28-dev automake1.11 apt-get -yq install gnutls-dev libconfuse-dev + echo "************ 5" if [ ! -d "$INSTALL_DIR/inadyn" ]; then if [ -d /repos/inadyn ]; then mkdir "$INSTALL_DIR/inadyn" @@ -516,17 +522,20 @@ function install_dynamicdns { git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn" fi fi + echo "************ 6" if [ ! -d "$INSTALL_DIR/inadyn" ]; then echo 'inadyn repo not cloned' echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs exit 6785 fi + echo "************ 7" cd "$INSTALL_DIR/inadyn" || exit 246824684 git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT" set_completion_param "inadyn commit" "$INADYN_COMMIT" ./autogen.sh + echo "************ 8" if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then exit 74890 fi