Browse Source

Add debug

Bob Mottram 6 years ago
parent
commit
1de4feca45
2 changed files with 9 additions and 3 deletions
  1. 0
    3
      src/freedombone-upgrade
  2. 9
    0
      src/freedombone-utils-web

+ 0
- 3
src/freedombone-upgrade View File

90
             chmod -R +r /usr/share/${PROJECT_NAME}
90
             chmod -R +r /usr/share/${PROJECT_NAME}
91
         fi
91
         fi
92
 
92
 
93
-        echo "test0"
94
         if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then
93
         if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then
95
             exit 453536
94
             exit 453536
96
         fi
95
         fi
97
 
96
 
98
         #rebuild_exim_with_socks
97
         #rebuild_exim_with_socks
99
-        echo "test1"
100
         install_dynamicdns
98
         install_dynamicdns
101
-        echo "test2"
102
         torrc_migrate
99
         torrc_migrate
103
         nodejs_upgrade
100
         nodejs_upgrade
104
         apt-get -yq -t stretch-backports install certbot
101
         apt-get -yq -t stretch-backports install certbot

+ 9
- 0
src/freedombone-utils-web View File

475
 }
475
 }
476
 
476
 
477
 function install_dynamicdns {
477
 function install_dynamicdns {
478
+    echo "************ 1"
478
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
479
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
479
         return
480
         return
480
     fi
481
     fi
482
+
483
+    echo "************ 2"
481
     if [[ $ONION_ONLY != "no" ]]; then
484
     if [[ $ONION_ONLY != "no" ]]; then
482
         return
485
         return
483
     fi
486
     fi
484
 
487
 
488
+    echo "************ 3"
485
     CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
489
     CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
486
     if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
490
     if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
487
         return
491
         return
488
     fi
492
     fi
489
 
493
 
494
+    echo "************ 4"
490
     if [ -f /usr/local/sbin/inadyn ]; then
495
     if [ -f /usr/local/sbin/inadyn ]; then
491
         if [ -d "$INSTALL_DIR/inadyn" ]; then
496
         if [ -d "$INSTALL_DIR/inadyn" ]; then
492
             rm -rf "$INSTALL_DIR/inadyn"
497
             rm -rf "$INSTALL_DIR/inadyn"
506
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
511
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
507
     apt-get -yq install gnutls-dev libconfuse-dev
512
     apt-get -yq install gnutls-dev libconfuse-dev
508
 
513
 
514
+    echo "************ 5"
509
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
515
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
510
         if [ -d /repos/inadyn ]; then
516
         if [ -d /repos/inadyn ]; then
511
             mkdir "$INSTALL_DIR/inadyn"
517
             mkdir "$INSTALL_DIR/inadyn"
516
             git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn"
522
             git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn"
517
         fi
523
         fi
518
     fi
524
     fi
525
+    echo "************ 6"
519
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
526
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
520
         echo 'inadyn repo not cloned'
527
         echo 'inadyn repo not cloned'
521
         echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
528
         echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
522
         exit 6785
529
         exit 6785
523
     fi
530
     fi
531
+    echo "************ 7"
524
     cd "$INSTALL_DIR/inadyn" || exit 246824684
532
     cd "$INSTALL_DIR/inadyn" || exit 246824684
525
     git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT"
533
     git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT"
526
     set_completion_param "inadyn commit" "$INADYN_COMMIT"
534
     set_completion_param "inadyn commit" "$INADYN_COMMIT"
527
 
535
 
528
     ./autogen.sh
536
     ./autogen.sh
529
 
537
 
538
+    echo "************ 8"
530
     if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then
539
     if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then
531
         exit 74890
540
         exit 74890
532
     fi
541
     fi