pyrox.dev
1diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plugin.in
2--- pipelight.old/bin/pipelight-plugin.in 2014-07-19 22:53:02.000000000 +0200
3+++ pipelight.new/bin/pipelight-plugin.in 2014-07-27 00:02:39.275834030 +0200
4@@ -92,7 +92,7 @@
5 PLUGIN_PATH=$(realpath "$PLUGIN_PATH")
6
7 # Global installation
8- if [ $(/usr/bin/id -u) -eq 0 ]; then
9+ if [ $(id -u) -eq 0 ]; then
10 INSTALLDIR="$PLUGIN_PATH"
11
12 # Use environment variable (only if it doesn't point to the global directory)
13@@ -594,7 +594,7 @@
14 fi
15
16 # Ensure the signature is valid, extract the content
17- if ! @@GPG@@ --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then
18+ if ! @@GPG@@ --homedir /tmp --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then
19 rm "$tmpfile"
20 rm "$decfile"
21 echo ""
22@@ -630,24 +630,10 @@
23 return 0
24 }
25
26-# Use fetch on FreeBSD if wget is not available
27-if command -v wget >/dev/null 2>&1; then
28- download_file()
29- {
30- wget -O "$1" "$2"
31- }
32-elif command -v fetch >/dev/null 2>&1; then
33- download_file()
34- {
35- fetch -o "$1" "$2"
36- }
37-else
38- download_file()
39- {
40- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2
41- return 1
42- }
43-fi
44+download_file()
45+{
46+ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2"
47+}
48
49 # Use shasum instead of sha256sum on MacOS / *BSD
50 if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then
51diff -urN pipelight.old/configure pipelight.new/configure
52--- pipelight.old/configure 2014-07-19 22:53:02.000000000 +0200
53+++ pipelight.new/configure 2014-07-26 23:52:13.690881447 +0200
54@@ -66,12 +66,8 @@
55 datadir=""
56 libdir=""
57 mandir=""
58-bash_interp="$(which bash)"
59-if which gpg &> /dev/null; then
60- gpg_exec="$(which gpg)"
61-else
62- gpg_exec="/usr/bin/gpg"
63-fi
64+bash_interp=bash
65+gpg_exec=gpg2
66 moz_plugin_path=""
67 gcc_runtime_dlls=""
68 so_mode="0644"
69diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dependency
70--- pipelight.old/share/install-dependency 2014-07-19 22:53:02.000000000 +0200
71+++ pipelight.new/share/install-dependency 2014-07-26 23:26:18.431938546 +0200
72@@ -734,42 +734,14 @@
73 return 0
74 }
75
76-# Use fetch on FreeBSD if wget is not available
77-if command -v wget >/dev/null 2>&1; then
78- download_file()
79- {
80- wget -O "$1" "$2"
81- }
82- get_download_size()
83- {
84- local filesize="$(wget -O- "$1" --spider --server-response 2>&1 | sed -ne '/Content-Length/{s/.*: //;p}')"
85- local re='^[0-9]+$'
86- if [[ "$filesize" -ne "0" ]] && [[ "$filesize" =~ $re ]]; then
87- echo "$(($filesize/(1024*1024)))"
88- else
89- echo "N/A"
90- fi
91- }
92-elif command -v fetch >/dev/null 2>&1; then
93- download_file()
94- {
95- fetch -o "$1" "$2"
96- }
97- get_download_size()
98- {
99- echo "N/A"
100- }
101-else
102- download_file()
103- {
104- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2
105- return 1
106- }
107- get_download_size()
108- {
109- echo "N/A"
110- }
111-fi
112+download_file()
113+{
114+ curl --cacert /etc/ssl/certs/ca-certificates.crt -o "$1" "$2"
115+}
116+get_download_size()
117+{
118+ echo "N/A"
119+}
120
121 # Use shasum instead of sha256sum on MacOS / *BSD
122 if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then