Browse Source

Create tox user from control panel

Bob Mottram 9 years ago
parent
commit
53e1ae04e7
2 changed files with 9 additions and 14 deletions
  1. 0
    13
      src/freedombone-app-tox
  2. 9
    1
      src/freedombone-controlpanel-user

+ 0
- 13
src/freedombone-app-tox View File

591
 	fi
591
 	fi
592
 	duration=$SECONDS
592
 	duration=$SECONDS
593
 	echo $"Toxic client compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed."
593
 	echo $"Toxic client compile $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed."
594
-
595
-	# create a tox user
596
-	if [ ${rootdir} ]; then
597
-		if [ ! -f ${rootdir}/home/${MY_USERNAME}/.config/tox/data.tox ]; then
598
-			chroot ${rootdir} toxid -u $MY_USERNAME -n data
599
-			chroot ${rootdir} chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
600
-		fi
601
-	else
602
-		if [ ! -f /home/${MY_USERNAME}/.config/tox/data.tox ]; then
603
-			toxid -u $MY_USERNAME -n data
604
-			chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
605
-		fi
606
-	fi
607
 }
594
 }
608
 
595
 
609
 function enable_tox_repo {
596
 function enable_tox_repo {

+ 9
- 1
src/freedombone-controlpanel-user View File

905
 	esac
905
 	esac
906
 }
906
 }
907
 
907
 
908
+function run_tox_client {
909
+	# create a tox user
910
+	if [ ! -f /home/${USER}/.config/tox/data.tox ]; then
911
+		toxid -u $USER -n data
912
+	fi
913
+	toxic -f /home/${USER}/.config/tox/data.tox --force-tcp --SOCKS5-proxy 127.0.0.1 9050
914
+}
915
+
908
 function menu_top_level {
916
 function menu_top_level {
909
 	while true
917
 	while true
910
 	do
918
 	do
933
 		case $(cat $data) in
941
 		case $(cat $data) in
934
 			1) mutt;;
942
 			1) mutt;;
935
 			2) menu_email;;
943
 			2) menu_email;;
936
-			3) toxic --force-tcp --SOCKS5-proxy 127.0.0.1 9050;;
944
+			3) run_tox_client;;
937
 			4) torify profanity;;
945
 			4) torify profanity;;
938
 			5) irssi;;
946
 			5) irssi;;
939
 			6) torify elinks;;
947
 			6) torify elinks;;