Skip to content
This repository
  • 2 commits
  • 8 files changed
  • 0 comments
  • 1 contributor
4 CHANGELOG
... ... @@ -1,3 +1,7 @@
  1 +v5.31
  2 +17-Mar-2013
  3 +Support for new profile location with qupzilla.
  4 +
1 5 v5.30
2 6 17-Mar-2013
3 7 Added support for seamonkey.
2  Makefile.archlinux
... ... @@ -1,4 +1,4 @@
1   -VERSION = 5.30
  1 +VERSION = 5.31
2 2 PN = profile-sync-daemon
3 3
4 4 PREFIX ?= /usr
2  Makefile.exherbo
... ... @@ -1,4 +1,4 @@
1   -VERSION = 5.30
  1 +VERSION = 5.31
2 2 PN = profile-sync-daemon
3 3
4 4 PREFIX ?= /usr
2  Makefile.fedora18
... ... @@ -1,4 +1,4 @@
1   -VERSION = 5.30
  1 +VERSION = 5.31
2 2 PN = profile-sync-daemon
3 3
4 4 PREFIX ?= /usr
2  Makefile.gentoo
... ... @@ -1,4 +1,4 @@
1   -VERSION = 5.30
  1 +VERSION = 5.31
2 2 PN = profile-sync-daemon
3 3
4 4 PREFIX ?= /usr
2  Makefile.ubuntu
... ... @@ -1,4 +1,4 @@
1   -VERSION = 5.30
  1 +VERSION = 5.31
2 2 PN = profile-sync-daemon
3 3
4 4 DESTDIR =
1  README.md
Source Rendered
@@ -14,6 +14,7 @@ Currently, the following browsers are auto-detected and managed:
14 14 * Opera-Next
15 15 * QupZilla
16 16 * Rekonq
  17 +* Seamonkey
17 18
18 19 ##Packages by Distro
19 20 * ![logo](http://www.monitorix.org/imgs/archlinux.png "arch logo")Arch via AUR: https://aur.archlinux.org/packages/profile-sync-daemon
78 common/profile-sync-daemon
@@ -68,6 +68,10 @@ set_which() {
68 68 fi
69 69
70 70 case "$browser" in
  71 + conkeror.mozdev.org)
  72 + DIRArr[0]="$homedir/.$browser"
  73 + PSNAME="xulrunner"
  74 + ;;
71 75 chromium|midori)
72 76 DIRArr[0]="$homedir/.config/$browser"
73 77 PSNAME="$browser"
@@ -76,20 +80,20 @@ set_which() {
76 80 DIRArr[0]="$homedir/.config/$browser"
77 81 PSNAME="chrome"
78 82 ;;
79   - firefox-trunk)
80   - if [[ -d $homedir/.mozilla/firefox-trunk ]]; then
81   - profileArr=( $(grep '[P,p]'ath= $homedir/.mozilla/firefox-trunk/profiles.ini|sed 's/[P,p]ath=//') )
82   - index=0
83   - PSNAME="$browser"
84   - for profileItem in ${profileArr[@]}; do
85   - if [[ $(echo $profileItem | cut -c1) = "/" ]]; then
86   - DIRArr[index]="$profileItem" # path is not relative
87   - else
88   - DIRArr[index]="$homedir/.mozilla/firefox-trunk/$profileItem" # we need to append the default path to give a fully qualified path
89   - fi
90   - index=$index+1
91   - done
92   - fi
  83 + opera|opera-next)
  84 + DIRArr[0]="$homedir/.$browser"
  85 + PSNAME="$browser"
  86 + ;;
  87 + qupzilla)
  88 + # http://blog.qupzilla.com/2013/03/qupzilla-140-released.html
  89 + [[ -d $homedir/.$browser ]] && DIRArr[0]="$homedir/.$browser"
  90 + [[ -d $homedir/.config/$browser ]] && DIRArr[0]="$homedir/.config/$browser"
  91 + PSNAME="$browser"
  92 + ;;
  93 + rekonq)
  94 + [[ -d $homedir/.kde4/share/apps/$browser ]] && DIRArr[0]="$homedir/.kde4/share/apps/$browser"
  95 + [[ -d $homedir/.kde/share/apps/$browser ]] && DIRArr[0]="$homedir/.kde/share/apps/$browser"
  96 + PSNAME="$browser"
93 97 ;;
94 98 firefox)
95 99 if [[ -d $homedir/.mozilla/firefox ]]; then
@@ -106,16 +110,16 @@ set_which() {
106 110 done
107 111 fi
108 112 ;;
109   - seamonkey)
110   - if [[ -d $homedir/.mozilla/seamonkey ]]; then
111   - profileArr=( $(grep '[P,p]'ath= $homedir/.mozilla/seamonkey/profiles.ini|sed 's/[P,p]ath=//') )
  113 + firefox-trunk)
  114 + if [[ -d $homedir/.mozilla/firefox-trunk ]]; then
  115 + profileArr=( $(grep '[P,p]'ath= $homedir/.mozilla/firefox-trunk/profiles.ini|sed 's/[P,p]ath=//') )
112 116 index=0
113 117 PSNAME="$browser"
114 118 for profileItem in ${profileArr[@]}; do
115 119 if [[ $(echo $profileItem | cut -c1) = "/" ]]; then
116 120 DIRArr[index]="$profileItem" # path is not relative
117 121 else
118   - DIRArr[index]="$homedir/.mozilla/seamonkey/$profileItem" # we need to append the default path to give a fully qualified path
  122 + DIRArr[index]="$homedir/.mozilla/firefox-trunk/$profileItem" # we need to append the default path to give a fully qualified path
119 123 fi
120 124 index=$index+1
121 125 done
@@ -137,18 +141,20 @@ set_which() {
137 141 done
138 142 fi
139 143 ;;
140   - rekonq)
141   - [[ -d $homedir/.kde4/share/apps/$browser ]] && DIRArr[0]="$homedir/.kde4/share/apps/$browser"
142   - [[ -d $homedir/.kde/share/apps/$browser ]] && DIRArr[0]="$homedir/.kde/share/apps/$browser"
143   - PSNAME="$browser"
144   - ;;
145   - opera|opera-next|qupzilla)
146   - DIRArr[0]="$homedir/.$browser"
147   - PSNAME="$browser"
148   - ;;
149   - conkeror.mozdev.org)
150   - DIRArr[0]="$homedir/.$browser"
151   - PSNAME="xulrunner"
  144 + seamonkey)
  145 + if [[ -d $homedir/.mozilla/seamonkey ]]; then
  146 + profileArr=( $(grep '[P,p]'ath= $homedir/.mozilla/seamonkey/profiles.ini|sed 's/[P,p]ath=//') )
  147 + index=0
  148 + PSNAME="$browser"
  149 + for profileItem in ${profileArr[@]}; do
  150 + if [[ $(echo $profileItem | cut -c1) = "/" ]]; then
  151 + DIRArr[index]="$profileItem" # path is not relative
  152 + else
  153 + DIRArr[index]="$homedir/.mozilla/seamonkey/$profileItem" # we need to append the default path to give a fully qualified path
  154 + fi
  155 + index=$index+1
  156 + done
  157 + fi
152 158 ;;
153 159 *)
154 160 # skip invalid browser entries
@@ -167,7 +173,7 @@ running_check() {
167 173 echo "Refusing to start; $browser is running by $user!"
168 174 exit 1
169 175 else
170   - /bin/true
  176 + return
171 177 fi
172 178 done
173 179 done
@@ -183,14 +189,14 @@ dup_check() {
183 189 set_which "$user" "$browser"
184 190 if [[ "$browser" = "firefox" ]] || [[ "$browser" = "firefox-trunk" ]] || [[ "$browser" = "heftig-aurora" ]] || [[ "$browser" = "seamonkey" ]]; then
185 191 if [[ -z ${DIRArr[@]} ]]; then
186   - /bin/true # nothing to check
  192 + return # nothing to check
187 193 else
188 194 # browser is on system so check profiles
189 195 #
190 196 # check that the LAST DIRECTORY in the full path is unique
191 197 unique_count=$(echo ${DIRArr[@]##*/} | sed 's/ /\n/g' | sort | uniq | wc -l)
192 198 if [[ ${#DIRArr[@]##*/} -eq $unique_count ]]; then
193   - /bin/true # no problems so do nothing
  199 + return # no problems so do nothing
194 200 else
195 201 echo -e " ${RED}Error: ${NRM}${BLD}dup profile for ${GRN}$browser${NRM}${BLD} detected. See psd manpage, correct, and try again."${NRM}
196 202 [[ "$browser" = "heftig-aurora" ]] && browser="${browser##*-}" # clip of the 'heftig-' to give correct path
@@ -216,7 +222,7 @@ kill_browsers() {
216 222 if [[ -n "$PSNAME" ]] && pgrep -u "$user" "$PSNAME" &>/dev/null; then
217 223 pkill -SIGTERM -u "$user" "$PSNAME"
218 224 else
219   - /bin/true
  225 + return
220 226 fi
221 227 x=$(( $x + 1 ))
222 228 done
@@ -231,7 +237,7 @@ parse_conf_file() {
231 237 else
232 238 echo -e "${RED}Profile-sync-daemon v$VERS${NRM}${BLD} on $(sed 's| \\.*$||' /etc/issue | head -n 1)."${NRM}
233 239 fi
234   -
  240 +
235 241 echo
236 242 echo -e "${BLD}Daemon file ${BLU}$DAEMON_FILE${NRM}${BLD} is $([[ -f $DAEMON_FILE ]] && echo present || echo not present)."${NRM}
237 243
@@ -284,7 +290,7 @@ ungraceful_state_check() {
284 290 [[ "$browser" = "firefox" ]] || [[ "$browser" = "firefox-trunk" ]] || [[ "$browser" = "heftig-aurora" ]] || [[ "$browser" = "seamonkey" ]] && suffix="-${item##*/}" || suffix=
285 291
286 292 if [[ -e "$DIR/.flagged" ]]; then # all is well so continue
287   - /bin/true
  293 + return
288 294 else
289 295 [[ -h "$DIR" ]] && unlink "$DIR"
290 296 [[ -d "$BACKUP" ]] && mv "$BACKUP" "$DIR"

No commit comments for this range

Something went wrong with that request. Please try again.