free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add debug

This commit is contained in:
Bob Mottram 2018-05-12 18:29:50 +01:00
parent 4ebdd8479e
commit 1de4feca45
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedombone-upgrade
View File

@ -90,15 +90,12 @@ if [ -d "$PROJECT_DIR" ]; then
chmod -R +r /usr/share/${PROJECT_NAME} chmod -R +r /usr/share/${PROJECT_NAME}
fi fi
echo "test0"
if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then
exit 453536 exit 453536
fi fi
#rebuild_exim_with_socks #rebuild_exim_with_socks
echo "test1"
install_dynamicdns install_dynamicdns
echo "test2"
torrc_migrate torrc_migrate
nodejs_upgrade nodejs_upgrade
apt-get -yq -t stretch-backports install certbot apt-get -yq -t stretch-backports install certbot

9
src/freedombone-utils-web
View File

@ -475,18 +475,23 @@ function upgrade_inadyn_config {
} }
function install_dynamicdns { function install_dynamicdns {
echo "************ 1"
if [[ $SYSTEM_TYPE == "mesh"* ]]; then if [[ $SYSTEM_TYPE == "mesh"* ]]; then
return return
fi fi
echo "************ 2"
if [[ $ONION_ONLY != "no" ]]; then if [[ $ONION_ONLY != "no" ]]; then
return return
fi fi
echo "************ 3"
CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit") CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
return return
fi fi
echo "************ 4"
if [ -f /usr/local/sbin/inadyn ]; then if [ -f /usr/local/sbin/inadyn ]; then
if [ -d "$INSTALL_DIR/inadyn" ]; then if [ -d "$INSTALL_DIR/inadyn" ]; then
rm -rf "$INSTALL_DIR/inadyn" 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 build-essential curl libgnutls28-dev automake1.11
apt-get -yq install gnutls-dev libconfuse-dev apt-get -yq install gnutls-dev libconfuse-dev
echo "************ 5"
if [ ! -d "$INSTALL_DIR/inadyn" ]; then if [ ! -d "$INSTALL_DIR/inadyn" ]; then
if [ -d /repos/inadyn ]; then if [ -d /repos/inadyn ]; then
mkdir "$INSTALL_DIR/inadyn" mkdir "$INSTALL_DIR/inadyn"
@ -516,17 +522,20 @@ function install_dynamicdns {
git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn" git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn"
fi fi
fi fi
echo "************ 6"
if [ ! -d "$INSTALL_DIR/inadyn" ]; then if [ ! -d "$INSTALL_DIR/inadyn" ]; then
echo 'inadyn repo not cloned' echo 'inadyn repo not cloned'
echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
exit 6785 exit 6785
fi fi
echo "************ 7"
cd "$INSTALL_DIR/inadyn" || exit 246824684 cd "$INSTALL_DIR/inadyn" || exit 246824684
git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT" git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT"
set_completion_param "inadyn commit" "$INADYN_COMMIT" set_completion_param "inadyn commit" "$INADYN_COMMIT"
./autogen.sh ./autogen.sh
echo "************ 8"
if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then
exit 74890 exit 74890
fi fi