|
@@ -214,6 +214,9 @@ function add_user_xmpp {
|
214
|
214
|
|
215
|
215
|
echo '[connection]' > /home/$new_username/.config/profanity/profrc
|
216
|
216
|
echo "account=${new_username}@${HOSTNAME}" >> /home/$new_username/.config/profanity/profrc
|
|
217
|
+ echo '' >> /home/$new_username/.config/profanity/profrc
|
|
218
|
+ echo '[plugins]' >> /home/$new_username/.config/profanity/profrc
|
|
219
|
+ echo 'load=prof_omemo_plugin.py;' >> /home/$new_username/.config/profanity/profrc
|
217
|
220
|
|
218
|
221
|
chown -R $new_username:$new_username /home/$new_username/.local
|
219
|
222
|
chown -R $new_username:$new_username /home/$new_username/.config
|
|
@@ -361,17 +364,26 @@ function upgrade_xmpp_client {
|
361
|
364
|
|
362
|
365
|
# upgrade omemo plugins for all users
|
363
|
366
|
set_repo_commit $INSTALL_DIR/profanity-omemo-plugin "profanity omemo plugin commit" "$PROFANITY_OMEMO_PLUGIN_COMMIT" $PROFANITY_OMEMO_PLUGIN_REPO
|
|
367
|
+ cd $INSTALL_DIR/profanity-omemo-plugin
|
|
368
|
+ sed -i 's|python setup.py|python2.7 setup.py|g' $INSTALL_DIR/profanity-omemo-plugin/install.sh
|
|
369
|
+ ./install.sh
|
364
|
370
|
for d in /home/*/ ; do
|
365
|
371
|
USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
|
366
|
372
|
if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
|
367
|
373
|
if [ ! -d /home/$USERNAME/.local/share/profanity/plugins ]; then
|
368
|
374
|
mkdir -p /home/$USERNAME/.local/share/profanity/plugins
|
369
|
375
|
fi
|
370
|
|
- cp $INSTALL_DIR/profanity-omemo-plugin/omemo.py /home/$USERNAME/.local/share/profanity/plugins
|
|
376
|
+ if [ -f $INSTALL_DIR/profanity-omemo-plugin/omemo.py ]; then
|
|
377
|
+ rm $INSTALL_DIR/profanity-omemo-plugin/omemo.*
|
|
378
|
+ fi
|
|
379
|
+ cp $INSTALL_DIR/profanity-omemo-plugin/deploy/prof_omemo_plugin.py /home/$USERNAME/.local/share/profanity/plugins
|
371
|
380
|
chown -R $USERNAME:$USERNAME /home/$USERNAME/.local
|
372
|
381
|
fi
|
373
|
382
|
done
|
374
|
|
- cp $INSTALL_DIR/profanity-omemo-plugin/omemo.py /etc/skel/.local/share/profanity/plugins
|
|
383
|
+ if [ -f /etc/skel/.local/share/profanity/plugins/omemo.py ]; then
|
|
384
|
+ rm /etc/skel/.local/share/profanity/plugins/omemo.*
|
|
385
|
+ fi
|
|
386
|
+ cp $INSTALL_DIR/profanity-omemo-plugin/deploy/prof_omemo_plugin.py /etc/skel/.local/share/profanity/plugins
|
375
|
387
|
}
|
376
|
388
|
|
377
|
389
|
function upgrade_xmpp {
|
|
@@ -976,17 +988,20 @@ function install_xmpp_client {
|
976
|
988
|
fi
|
977
|
989
|
|
978
|
990
|
# install the omemo plugin
|
|
991
|
+ apt-get -yq install python-pip python-setuptools clang libffi-dev libssl-dev
|
979
|
992
|
git_clone $PROFANITY_OMEMO_PLUGIN_REPO $INSTALL_DIR/profanity-omemo-plugin
|
980
|
993
|
cd $INSTALL_DIR/profanity-omemo-plugin
|
981
|
994
|
git checkout $PROFANITY_OMEMO_PLUGIN_COMMIT -b $PROFANITY_OMEMO_PLUGIN_COMMIT
|
982
|
|
- if [ ! -f $INSTALL_DIR/profanity-omemo-plugin/omemo.py ]; then
|
983
|
|
- echo $'omemo.py not found'
|
|
995
|
+ if [ ! -f $INSTALL_DIR/profanity-omemo-plugin/deploy/prof_omemo_plugin.py ]; then
|
|
996
|
+ echo $'prof_omemo_plugin.py not found'
|
984
|
997
|
exit 389225
|
985
|
998
|
fi
|
|
999
|
+ sed -i 's|python setup.py|python2.7 setup.py|g' $INSTALL_DIR/profanity-omemo-plugin/install.sh
|
|
1000
|
+ ./install.sh
|
986
|
1001
|
|
987
|
1002
|
mkdir -p /etc/skel/.local/share/profanity/plugins
|
988
|
|
- cp $INSTALL_DIR/profanity-omemo-plugin/omemo.py /etc/skel/.local/share/profanity/plugins
|
989
|
|
- cp $INSTALL_DIR/profanity-omemo-plugin/omemo.py /home/$MY_USERNAME/.local/share/profanity/plugins
|
|
1003
|
+ cp $INSTALL_DIR/profanity-omemo-plugin/deploy/prof_omemo_plugin.py /etc/skel/.local/share/profanity/plugins
|
|
1004
|
+ cp $INSTALL_DIR/profanity-omemo-plugin/deploy/prof_omemo_plugin.py /home/$MY_USERNAME/.local/share/profanity/plugins
|
990
|
1005
|
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.local
|
991
|
1006
|
|
992
|
1007
|
XMPP_CLIENT_DIR=/home/$MY_USERNAME/.local/share/profanity
|
|
@@ -1049,6 +1064,9 @@ function install_xmpp_client {
|
1049
|
1064
|
fi
|
1050
|
1065
|
echo '[connection]' > /home/$MY_USERNAME/.config/profanity/profrc
|
1051
|
1066
|
echo "account=${MY_USERNAME}@${DEFAULT_DOMAIN_NAME}" >> /home/$MY_USERNAME/.config/profanity/profrc
|
|
1067
|
+ echo '' >> /home/$MY_USERNAME/.config/profanity/profrc
|
|
1068
|
+ echo '[plugins]' >> /home/$MY_USERNAME/.config/profanity/profrc
|
|
1069
|
+ echo 'load=prof_omemo_plugin.py;' >> /home/$MY_USERNAME/.config/profanity/profrc
|
1052
|
1070
|
|
1053
|
1071
|
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.local
|
1054
|
1072
|
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
|