アンインストール時公開鍵の削除、playonlinuxのバグ対策

diff --git a/scripts/delplayonlinuxkey.py b/scripts/delplayonlinuxkey.py
new file mode 100755 (executable)
index 0000000..0eec5f3
--- /dev/null
+++ b/scripts/delplayonlinuxkey.py
@@ -0,0 +1,21 @@
+import subprocess
+import sys
+
+keylist = open("/tmp/playonlinuxuninstall/keylist", "r")
+lines = keylist.readlines()
+
+line_num = None
+for i, line in enumerate(lines) :
+
+    if "PlayOnLinux" in line :
+        line_num = i - 1
+        break
+
+if line_num is None :
+    sys.exit()
+
+IDs = lines[line_num].split()
+ID = IDs[len(IDs)-2] + IDs[len(IDs)-1]
+
+subprocess.call(["sudo", "apt-key", "del", ID])
+

diff --git a/scripts/delwinekey.py b/scripts/delwinekey.py
new file mode 100755 (executable)
index 0000000..1878bc7
--- /dev/null
+++ b/scripts/delwinekey.py
@@ -0,0 +1,20 @@
+import subprocess
+import sys
+
+keylist = open("/tmp/wineuninstall/keylist", "r")
+lines = keylist.readlines()
+
+line_num = None
+for i, line in enumerate(lines) :
+
+    if "WineHQ" in line :
+        line_num = i - 1 
+        break
+
+if line_num is None :
+    sys.exit()
+
+IDs = lines[line_num].split()
+ID = IDs[len(IDs)-2] + IDs[len(IDs)-1]
+
+subprocess.call(["sudo", "apt-key", "del", ID])

diff --git a/scripts/flashinstall.sh b/scripts/flashinstall.sh
index 9b223ec..3a87141 100755 (executable)
--- a/scripts/flashinstall.sh
+++ b/scripts/flashinstall.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sudo apt install flashplugin-installer
+sudo apt -y install flashplugin-installer

diff --git a/scripts/playonlinuxinstall.sh b/scripts/playonlinuxinstall.sh
index 1cc0099..8764461 100755 (executable)
--- a/scripts/playonlinuxinstall.sh
+++ b/scripts/playonlinuxinstall.sh
@@ -12,5 +12,12 @@ sudo wget http://deb.playonlinux.com/playonlinux_bionic.list -O /etc/apt/sources
 
 sudo apt -y install playonlinux
 
+cp /etc/bash.bashrc ./bash.bashrc
+echo "alias playonlinux='LC_ALL=C playonlinux'" >> ./bash.bashrc
+sudo chmod 644 ./bash.bashrc
+sudo cp /etc/bash.bashrc /etc/bash.bashrc.backup
+sudo rm /etc/bash.bashrc
+sudo mv ./bash.bashrc /etc/bash.bashrc
+
 rm -rf /tmp/playonlinuxinstall
 

diff --git a/scripts/playonlinuxuninstall.sh b/scripts/playonlinuxuninstall.sh
index 16fcbdb..caa14c0 100755 (executable)
--- a/scripts/playonlinuxuninstall.sh
+++ b/scripts/playonlinuxuninstall.sh
@@ -5,3 +5,20 @@ sudo apt -y autoremove
 
 sudo rm -rf /etc/apt/sources.list.d/playonlinux.list
 
+rm -rf /tmp/playonlinuxuninstall
+mkdir /tmp/playonlinuxuninstall
+apt-key list > /tmp/playonlinuxuninstall/keylist
+
+SCRIPT_DIR=$(cd $(dirname $0); pwd)
+cd $SCRIPT_DIR
+python3 delplayonlinuxkey.py
+
+cd /tmp/playonlinuxuninstall
+
+cat /etc/bash.bashrc | sed -e "/alias playonlinux='LC_ALL=C playonlinux'/d" > ./bash.bashrc
+sudo cp /etc/bash.bashrc /etc/bash.bashrc.backup
+sudo rm /etc/bash.bashrc
+sudo mv ./bash.bashrc /etc/bash.bashrc
+
+rm -rf /tmp/playonlinuxuninstall
+

diff --git a/scripts/wineuninstall.sh b/scripts/wineuninstall.sh
index 8919677..b34ac70 100755 (executable)
--- a/scripts/wineuninstall.sh
+++ b/scripts/wineuninstall.sh
@@ -1,7 +1,18 @@
 #!/bin/bash
 
-sudo apt -y remove winehq-stable
+sudo apt -y purge winehq-stable
 sudo apt -y autoremove
 
 sudo apt-add-repository -y --remove 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
 
+rm -rf /tmp/wineuninstall
+mkdir /tmp/wineuninstall
+
+apt-key list > /tmp/wineuninstall/keylist
+
+SCRIPT_DIR=$(cd $(dirname $0); pwd)
+cd $SCRIPT_DIR
+
+python3 delwinekey.py
+
+rm -rf /tmp/wineuninstall