Merge pull request #27 from rbreaves/dev

Fixes tweak selection during install

README.md

@@ -194,6 +194,7 @@ https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste
 
 ## More information about Kinto
 
+https://medium.com/@benreaves/kinto-v1-0-released-2018e6401d2e
 https://medium.com/@benreaves/kinto-a-mac-inspired-keyboard-mapping-for-linux-58f731817c0
 
 ## License

setup.py

@@ -130,23 +130,28 @@ if(onetime):
 print("\nDynamic shortcut tweaks\n")
 
 intents = [obj for obj in user_config['de'] if(obj['intent'] == "gui_term")]
+tweaks = []
+tweaks_selected = []
 
 for index, k in enumerate(intents):
 	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'Description: ' + k['description'] + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'run in gui mode: ' + k['run_gui'].replace(";", "\n") + bcolors.ENDC)
 	print(bcolors.CYELLOW + 'run in terminal mode: ' + k['run_term'].replace(";", "\n") + bcolors.ENDC + '\n')
+	tweaks.append(k['id'])
 
 print(bcolors.CYELLOW + "Please enter your dynamic shortcut tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
 defaultde = [int(i) for i in input().split()]
-if len(defaultde) != 0:
-	# gui
-	user_config['config'][0]['de'] = defaultde
-	# term
-	user_config['config'][1]['de'] = defaultde
 
 for d in defaultde:
-    user_config['de'][d-1]['active'] = True
+    user_config['de'][tweaks[d-1]]['active'] = True
+    tweaks_selected.append(tweaks[d-1])
+
+if len(defaultde) != 0:
+	# gui
+	user_config['config'][0]['de'] = tweaks_selected
+	# term
+	user_config['config'][1]['de'] = tweaks_selected
 
 user_config['config'][0]['run'] = keyboardconfigs[defaultkb-1]['gui']
 user_config['config'][1]['run'] = keyboardconfigs[defaultkb-1]['term']